pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-21 10:11:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #473 from noudess/master

Browse Source 
Repair issue with Bind Wounds when you are binding someone that is binding themselves.
This commit is contained in:
Alex 2015-12-17 13:09:33 -08:00
commit c1feb93e2e
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog.txt
View File

@ -1,5 +1,8 @@
EQEMu Changelog (Started on Sept 24, 2003 15:50) EQEMu Changelog (Started on Sept 24, 2003 15:50)
------------------------------------------------------- -------------------------------------------------------
== 12/16/2015 ==
Noudess: Repaired issue with Bind Wounds on someone else. Message was not coming out on client (hold still) and a bind wounds on someone already binding their wounds would interrupt their bind and make them stand. Also removed some duplicate messaging.
== 12/14/2015 == == 12/14/2015 ==
Kinglykrab: Added IsBlind() and IsFeared() functionality to Perl and Lua. Kinglykrab: Added IsBlind() and IsFeared() functionality to Perl and Lua.
- Note: Both methods are Mob methods and may be used on NPCs or PCs. - Note: Both methods are Mob methods and may be used on NPCs or PCs.

9
zone/client.cpp
View File

@ -2577,12 +2577,7 @@ bool Client::BindWound(Mob* bindmob, bool start, bool fail){
else { else {
// send bindmob "stand still" // send bindmob "stand still"
if(!bindmob->IsAIControlled() && bindmob != this ) { if(!bindmob->IsAIControlled() && bindmob != this ) {
bind_out->type = 2; // ? bindmob->CastToClient()->Message_StringID(clientMessageYellow, YOU_ARE_BEING_BANDAGED);
//bind_out->type = 3; // ?
bind_out->to = GetID(); // ?
bindmob->CastToClient()->QueuePacket(outapp);
bind_out->type = 0;
bind_out->to = 0;
} }
else if (bindmob->IsAIControlled() && bindmob != this ){ else if (bindmob->IsAIControlled() && bindmob != this ){
; // Tell IPC to stand still? ; // Tell IPC to stand still?
@ -2668,7 +2663,7 @@ bool Client::BindWound(Mob* bindmob, bool start, bool fail){
else { else {
//I dont have the real, live //I dont have the real, live
Message(15, "You cannot bind wounds above %d%% hitpoints.", max_percent); Message(15, "You cannot bind wounds above %d%% hitpoints.", max_percent);
if(bindmob->IsClient()) if(bindmob != this && bindmob->IsClient())
bindmob->CastToClient()->Message(15, "You cannot have your wounds bound above %d%% hitpoints.", max_percent); bindmob->CastToClient()->Message(15, "You cannot have your wounds bound above %d%% hitpoints.", max_percent);
// Too many hp message goes here. // Too many hp message goes here.
} }

1
zone/string_ids.h
View File

@ -27,6 +27,7 @@
#define GAIN_XP 138 //You gain experience!! #define GAIN_XP 138 //You gain experience!!
#define GAIN_GROUPXP 139 //You gain party experience!! #define GAIN_GROUPXP 139 //You gain party experience!!
#define BOW_DOUBLE_DAMAGE 143 //Your bow shot did double dmg. #define BOW_DOUBLE_DAMAGE 143 //Your bow shot did double dmg.
#define YOU_ARE_BEING_BANDAGED 147 //Someone is bandaging you.
#define FORAGE_GRUBS 150 //You have scrounged up some fishing grubs. #define FORAGE_GRUBS 150 //You have scrounged up some fishing grubs.
#define FORAGE_WATER 151 //You have scrounged up some water. #define FORAGE_WATER 151 //You have scrounged up some water.
#define FORAGE_FOOD 152 //You have scrounged up some food. #define FORAGE_FOOD 152 //You have scrounged up some food.