diff --git a/2006Redone Server/src/com/rebotted/game/content/minigames/Dueling.java b/2006Redone Server/src/com/rebotted/game/content/minigames/Dueling.java index e43139b4..375cb6fa 100644 --- a/2006Redone Server/src/com/rebotted/game/content/minigames/Dueling.java +++ b/2006Redone Server/src/com/rebotted/game/content/minigames/Dueling.java @@ -406,7 +406,9 @@ public class Dueling { public void confirmDuel() { Client o = (Client) PlayerHandler.players[player.duelingWith]; - if (o == null) { + if (o == null || ((o.getDueling().stakedItems.size() + o.getDueling().otherStakedItems.size()) > player.getItemAssistant().freeSlots())) { + player.getPacketSender().sendMessage("Not enough inventory spaces."); + o.getPacketSender().sendMessage("Not enough inventory spaces."); declineDuel(); return; } @@ -703,8 +705,10 @@ public class Dueling { } player.getPacketSender().closeAllWindows(); player.duelStatus = 0; + o.duelStatus = 0; player.openDuel = false; o.openDuel = false; + player.duelingWith = 0; player.duelSpaceReq = 0; player.duelRequested = false; diff --git a/2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java b/2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java index 3ce19224..2224fdee 100644 --- a/2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java +++ b/2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java @@ -551,8 +551,6 @@ public class ItemAssistant { } return false; } else { - GameEngine.itemHandler.createGroundItem(c, item, - c.getX(), c.getY(), 1, c.getId()); resetItems(3214); c.getPacketSender().sendMessage("Not enough space in your inventory."); return false; diff --git a/2006Redone Server/src/com/rebotted/net/packets/impl/ClickingButtons.java b/2006Redone Server/src/com/rebotted/net/packets/impl/ClickingButtons.java index 28bd3674..c4f4ce1f 100644 --- a/2006Redone Server/src/com/rebotted/net/packets/impl/ClickingButtons.java +++ b/2006Redone Server/src/com/rebotted/net/packets/impl/ClickingButtons.java @@ -1409,7 +1409,7 @@ public class ClickingButtons implements PacketType { player.getPacketSender().sendFrame126( "Waiting for other player...", 6571); o1.getPacketSender().sendFrame126( - "Other player has accepted", 6571); + "Other player has accepted.", 6571); } } else { Client o = (Client) PlayerHandler.players[player.duelingWith]; @@ -1651,7 +1651,7 @@ public class ClickingButtons implements PacketType { } player.getPacketSender().sendFrame126( "Waiting for other player...", 3431); - ot.getPacketSender().sendFrame126("Other player has accepted", + ot.getPacketSender().sendFrame126("Other player has accepted.", 3431); player.goodTrade = true; ot.goodTrade = true; @@ -1681,15 +1681,15 @@ public class ClickingButtons implements PacketType { player.goodTrade = false; ot.goodTrade = false; player.getPacketSender().sendFrame126( - "Not enough space in your inventory.", 3431); + "Not enough inventory spaces.", 3431); ot.getPacketSender().sendFrame126( - "Not enough space in your inventory.", 3431); + "Not enough inventory spaces.", 3431); break; } else { player.getPacketSender().sendFrame126( "Waiting for other player...", 3431); ot.getPacketSender().sendFrame126( - "Other player has accepted", 3431); + "Other player has accepted.", 3431); player.goodTrade = true; ot.goodTrade = true; }