2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-07 08:39:07 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Fixed dcing on picking up items when inventory is full that I introduced (#338)

Browse Source
This commit is contained in:
Gptaqbc
2019-12-30 13:45:05 -05:00
committed by Daniel Ginovker
parent e6e18efe34
commit 6ce09f3091
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/com/rebotted/game/content/minigames/Dueling.java
+5 -1
View File
@@ -406,7 +406,9 @@ public class Dueling {
public void confirmDuel() { public void confirmDuel() {
Client o = (Client) PlayerHandler.players[player.duelingWith]; 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(); declineDuel();
return; return;
} }
@@ -703,8 +705,10 @@ public class Dueling {
} }
player.getPacketSender().closeAllWindows(); player.getPacketSender().closeAllWindows();
player.duelStatus = 0; player.duelStatus = 0;
o.duelStatus = 0;
player.openDuel = false; player.openDuel = false;
o.openDuel = false; o.openDuel = false;
player.duelingWith = 0; player.duelingWith = 0;
player.duelSpaceReq = 0; player.duelSpaceReq = 0;
player.duelRequested = false; player.duelRequested = false;
2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java
-2
View File
@@ -551,8 +551,6 @@ public class ItemAssistant {
} }
return false; return false;
} else { } else {
GameEngine.itemHandler.createGroundItem(c, item,
c.getX(), c.getY(), 1, c.getId());
resetItems(3214); resetItems(3214);
c.getPacketSender().sendMessage("Not enough space in your inventory."); c.getPacketSender().sendMessage("Not enough space in your inventory.");
return false; return false;
2006Redone Server/src/com/rebotted/net/packets/impl/ClickingButtons.java
+5 -5
View File
@@ -1409,7 +1409,7 @@ public class ClickingButtons implements PacketType {
player.getPacketSender().sendFrame126( player.getPacketSender().sendFrame126(
"Waiting for other player...", 6571); "Waiting for other player...", 6571);
o1.getPacketSender().sendFrame126( o1.getPacketSender().sendFrame126(
"Other player has accepted", 6571); "Other player has accepted.", 6571);
} }
} else { } else {
Client o = (Client) PlayerHandler.players[player.duelingWith]; Client o = (Client) PlayerHandler.players[player.duelingWith];
@@ -1651,7 +1651,7 @@ public class ClickingButtons implements PacketType {
} }
player.getPacketSender().sendFrame126( player.getPacketSender().sendFrame126(
"Waiting for other player...", 3431); "Waiting for other player...", 3431);
ot.getPacketSender().sendFrame126("Other player has accepted", ot.getPacketSender().sendFrame126("Other player has accepted.",
3431); 3431);
player.goodTrade = true; player.goodTrade = true;
ot.goodTrade = true; ot.goodTrade = true;
@@ -1681,15 +1681,15 @@ public class ClickingButtons implements PacketType {
player.goodTrade = false; player.goodTrade = false;
ot.goodTrade = false; ot.goodTrade = false;
player.getPacketSender().sendFrame126( player.getPacketSender().sendFrame126(
"Not enough space in your inventory.", 3431); "Not enough inventory spaces.", 3431);
ot.getPacketSender().sendFrame126( ot.getPacketSender().sendFrame126(
"Not enough space in your inventory.", 3431); "Not enough inventory spaces.", 3431);
break; break;
} else { } else {
player.getPacketSender().sendFrame126( player.getPacketSender().sendFrame126(
"Waiting for other player...", 3431); "Waiting for other player...", 3431);
ot.getPacketSender().sendFrame126( ot.getPacketSender().sendFrame126(
"Other player has accepted", 3431); "Other player has accepted.", 3431);
player.goodTrade = true; player.goodTrade = true;
ot.goodTrade = true; ot.goodTrade = true;
} }