From 983755a21dac2521be2e6dda58090f1d48818f5e Mon Sep 17 00:00:00 2001 From: chadryx Date: Wed, 27 Aug 2014 19:01:41 +0300 Subject: Added a new hook Called when a player's money is at limit --- src/server/game/Entities/Player/Player.cpp | 2 ++ src/server/game/Scripting/ScriptMgr.cpp | 5 +++++ src/server/game/Scripting/ScriptMgr.h | 4 ++++ 3 files changed, 11 insertions(+) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 1fc1cd9f7b8..2876b4fc67d 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -22684,6 +22684,8 @@ bool Player::ModifyMoney(int32 amount, bool sendError /*= true*/) SetMoney(GetMoney() + amount); else { + sScriptMgr->OnPlayerMoneyLimit(this, amount); + if (sendError) SendEquipError(EQUIP_ERR_TOO_MUCH_GOLD, NULL, NULL); return false; diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index daa4c36a442..d13c81ed059 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -1180,6 +1180,11 @@ void ScriptMgr::OnPlayerMoneyChanged(Player* player, int32& amount) FOREACH_SCRIPT(PlayerScript)->OnMoneyChanged(player, amount); } +void ScriptMgr::OnPlayerMoneyLimit(Player* player, int32 amount) +{ + FOREACH_SCRIPT(PlayerScript)->OnMoneyLimit(player, amount); +} + void ScriptMgr::OnGivePlayerXP(Player* player, uint32& amount, Unit* victim) { FOREACH_SCRIPT(PlayerScript)->OnGiveXP(player, amount, victim); diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index ea25d51dab2..499d7ff6c09 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -706,6 +706,9 @@ class PlayerScript : public UnitScript // Called when a player's money is modified (before the modification is done) virtual void OnMoneyChanged(Player* /*player*/, int32& /*amount*/) { } + // Called when a player's money is at limit (amount = money tried to add) + virtual void OnMoneyLimit(Player* /*player*/, int32 /*amount*/) { } + // Called when a player gains XP (before anything is given) virtual void OnGiveXP(Player* /*player*/, uint32& /*amount*/, Unit* /*victim*/) { } @@ -1053,6 +1056,7 @@ class ScriptMgr void OnPlayerFreeTalentPointsChanged(Player* player, uint32 newPoints); void OnPlayerTalentsReset(Player* player, bool noCost); void OnPlayerMoneyChanged(Player* player, int32& amount); + void OnPlayerMoneyLimit(Player* player, int32 amount); void OnGivePlayerXP(Player* player, uint32& amount, Unit* victim); void OnPlayerReputationChange(Player* player, uint32 factionID, int32& standing, bool incremental); void OnPlayerDuelRequest(Player* target, Player* challenger); -- cgit v1.2.3 From 66f4b51d6f9dfa0dbeaf7f228d1f2bf9fac05590 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Wed, 27 Aug 2014 21:47:05 +0200 Subject: Core/RA: Workaround for telnet active mode Add a workaround for telnet connections with active mode. A proper fix would require boost tcp::socket to support timeout on receive. --- src/server/worldserver/RemoteAccess/RASession.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/server/worldserver/RemoteAccess/RASession.cpp b/src/server/worldserver/RemoteAccess/RASession.cpp index 846a4eb39e3..9892019ae5a 100644 --- a/src/server/worldserver/RemoteAccess/RASession.cpp +++ b/src/server/worldserver/RemoteAccess/RASession.cpp @@ -31,12 +31,12 @@ using boost::asio::ip::tcp; void RASession::Start() { - boost::asio::socket_base::bytes_readable command(true); - _socket.io_control(command); - std::size_t bytes_readable = command.get(); + // wait 1 second for active connections to send negotiation request + for (int counter = 0; counter < 10 && _socket.available() == 0; counter++) + std::this_thread::sleep_for(std::chrono::milliseconds(100)); // Check if there are bytes available, if they are, then the client is requesting the negotiation - if (bytes_readable > 0) + if (_socket.available() > 0) { // Handle subnegotiation boost::array buf; -- cgit v1.2.3