pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-17 18:41:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Fix #cast defaulting to cast time (#3617)

Browse Source 
# Notes
- Defaulted to using cast time instead of instant.
This commit is contained in:
Alex King 2023-10-13 21:12:34 -04:00 committed by GitHub
parent 9884c442e9
commit 565baec675
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/features.h
View File

@ -250,9 +250,7 @@ enum {
commandMovecharSelfOnly = 80, //below this == only self move allowed commandMovecharSelfOnly = 80, //below this == only self move allowed
commandMovecharToSpecials = 200, //ability to send people to cshom/load zones commandMovecharToSpecials = 200, //ability to send people to cshom/load zones
commandCastSpecials = 100, //can cast special spells commandCastSpecials = 100, //can cast special spells
commandInstacast = 100, //insta-cast all #casted spells
commandDoAnimOthers = 100, //can #doanim on others commandDoAnimOthers = 100, //can #doanim on others
commandLockZones = 101, //can lock or unlock zones
commandEditPlayerCorpses = 150, //can Edit Player Corpses commandEditPlayerCorpses = 150, //can Edit Player Corpses
commandInterrogateInv = 100, //below this == only log on error state and self-only target dump commandInterrogateInv = 100, //below this == only log on error state and self-only target dump
commandInvSnapshot = 150 //ability to clear/restore snapshots commandInvSnapshot = 150 //ability to clear/restore snapshots

9
zone/gm_commands/castspell.cpp
View File

@ -31,13 +31,8 @@ void command_castspell(Client *c, const Seperator *sep)
return; return;
} }
const bool can_instant_cast = c->Admin() >= commandInstacast; const bool instant_cast = sep->IsNumber(2) ? Strings::ToBool(sep->arg[2]) : true;
bool instant_cast = false; const uint16 target_id = t->GetID();
if (can_instant_cast && sep->IsNumber(2)) {
instant_cast = Strings::ToBool(sep->arg[2]);
}
const uint16 target_id = t->GetID();
if (instant_cast) { if (instant_cast) {
c->SpellFinished(spell_id, t); c->SpellFinished(spell_id, t);