Digitalstack/SabrehavenServer
2
0
Fork 0
mirror of https://github.com/ErikasKontenis/SabrehavenServer.git synced 2025-04-30 17:49:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix runeFunction

Browse Source
This commit is contained in:
ErikasKontenis 2020-02-17 20:35:22 +02:00
parent a3cb7f6d32
commit 24f95d7094
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/spells.cpp
View File

@ -1808,34 +1808,37 @@ bool RuneSpell::executeUse(Player* player, Item* item, const Position&, Thing* t
return false; return false;
} }
if (!scripted) { bool result = false;
return false; if (scripted) {
} LuaVariant var;
LuaVariant var; if (needTarget) {
var.type = VARIANT_NUMBER;
if (needTarget) { if (target == nullptr) {
var.type = VARIANT_NUMBER; Tile* toTile = g_game.map.getTile(toPosition);
if (toTile) {
if (target == nullptr) { const Creature* visibleCreature = toTile->getTopCreature();
Tile* toTile = g_game.map.getTile(toPosition); if (visibleCreature) {
if (toTile) { var.number = visibleCreature->getID();
const Creature* visibleCreature = toTile->getTopCreature(); }
if (visibleCreature) {
var.number = visibleCreature->getID();
} }
} }
else {
var.number = target->getCreature()->getID();
}
} }
else { else {
var.number = target->getCreature()->getID(); var.type = VARIANT_POSITION;
var.pos = toPosition;
} }
}
else { result = internalCastSpell(player, var, isHotkey);
var.type = VARIANT_POSITION; } else if (runeFunction) {
var.pos = toPosition; result = runeFunction(this, player, toPosition);
} }
if (!internalCastSpell(player, var, isHotkey)) { if (!result) {
return false; return false;
} }