IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-07 13:45:42 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Trading bug and Mods Revenge.

Browse source
This commit is contained in:
SilicaAndPina 2021-05-11 22:36:46 +12:00
parent 5fedb7841d
commit b5ae6946a9
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Horse Isle Server/HorseIsleServer/Game/Events/ModsRevenge.cs
View file

@ -14,6 +14,7 @@ namespace HISP.Game.Events
{ {
Thrower = thrower; Thrower = thrower;
ThrownAt = new List<User>(); ThrownAt = new List<User>();
} }
public User Thrower; public User Thrower;
public List<User> ThrownAt; public List<User> ThrownAt;
@ -78,6 +79,7 @@ namespace HISP.Game.Events
private void revengeTimedOut(object state) private void revengeTimedOut(object state)
{ {
resetEvent(); resetEvent();
EndEvent();
} }
private void resetEvent() private void resetEvent()
@ -94,7 +96,9 @@ namespace HISP.Game.Events
return throwTracker; return throwTracker;
} }
return new ThrowTracker(thrower); ThrowTracker tracker = new ThrowTracker(thrower);
trackedThrows.Add(tracker);
return tracker;
} }
private bool checkUserThrownAtAlready(ThrowTracker tracker, User thrownAt) private bool checkUserThrownAtAlready(ThrowTracker tracker, User thrownAt)
@ -123,7 +127,7 @@ namespace HISP.Game.Events
public void Payout(User thrower, User throwAt) public void Payout(User thrower, User throwAt)
{ {
ThrowTracker throwCounter = getUserThrowTracker(thrower); ThrowTracker throwCounter = getUserThrowTracker(thrower);
if(checkUserThrownAtAlready(throwCounter, throwAt)) if(!checkUserThrownAtAlready(throwCounter, throwAt))
{ {
byte[] otherEarned = PacketBuilder.CreateChat(Messages.FormatModSplatterBallAwardedOther(thrower.Username), PacketBuilder.CHAT_BOTTOM_RIGHT); byte[] otherEarned = PacketBuilder.CreateChat(Messages.FormatModSplatterBallAwardedOther(thrower.Username), PacketBuilder.CHAT_BOTTOM_RIGHT);

3
Horse Isle Server/HorseIsleServer/Server/GameServer.cs
View file

@ -4671,7 +4671,8 @@ namespace HISP.Server
// Cancel Trades // Cancel Trades
if (loggedInUser.TradingWith != null) if (loggedInUser.TradingWith != null)
loggedInUser.TradingWith.CancelTradeMoved(); if((loggedInUser.TradingWith.Trader.X != loggedInUser.X) && (loggedInUser.TradingWith.Trader.Y != loggedInUser.Y))
loggedInUser.TradingWith.CancelTradeMoved();
loggedInUser.PendingBuddyRequestTo = null; loggedInUser.PendingBuddyRequestTo = null;
// Close Social Windows // Close Social Windows