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

Merge branch 'misc2' of https://github.com/RedSparr0w/2006rebotted

Browse Source
This commit is contained in:
dginovker
2019-12-05 23:08:25 -05:00
parent 06798c5e90 8317f3f031
commit 9c21669609
2 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/com/rebotted/game/players/PlayerAssistant.java
+32 -36
View File
@@ -1461,47 +1461,43 @@ public class PlayerAssistant {
player.freezeTimer = 0; player.freezeTimer = 0;
player.getPacketSender().closeAllWindows(); player.getPacketSender().closeAllWindows();
player.tradeResetNeeded = true; player.tradeResetNeeded = true;
if (player.duelStatus <= 4) { if (player.duelStatus <= 4 // Player Duelling
if (!CastleWars.isInCw(player) && !PestControl.isInGame(player) && !player.inDuelArena() // Dual Arena
&& !PestControl.isInPcBoat(player) && !CastleWars.isInCw(player) // Castle Wars
&& player.tutorialProgress > 35 && !PestControl.isInGame(player) // Pest Control
&& FightPits.getState(player) == null && !PestControl.isInPcBoat(player) // Pest Control
&& !player.inFightCaves()) { && player.tutorialProgress > 35 // Tutorial Island
player.getItemAssistant().resetKeepItems(); && FightPits.getState(player) == null // Fight Pits
if (player.playerRights != 3) { && !player.inFightCaves() // Fight Caves
if (!player.isSkulled) { // what items to keep ) {
player.getItemAssistant().keepItem(0, true); player.getItemAssistant().resetKeepItems();
player.getItemAssistant().keepItem(1, true); // admin and bots do not lose/drop items
player.getItemAssistant().keepItem(2, true); if (player.playerRights != 3 && !player.isBot) {
} if (!player.isSkulled) { // what items to keep
if (player.getPrayer().prayerActive[10] player.getItemAssistant().keepItem(0, true);
&& System.currentTimeMillis() - player.lastProtItem > 700) { player.getItemAssistant().keepItem(1, true);
player.getItemAssistant().keepItem(3, true); player.getItemAssistant().keepItem(2, true);
} }
player.getItemAssistant().dropAllItems(); // drop all items if (player.getPrayer().prayerActive[10] && System.currentTimeMillis() - player.lastProtItem > 700) {
player.getItemAssistant().deleteAllItems(); // delete all player.getItemAssistant().keepItem(3, true);
// items }
player.getItemAssistant().dropAllItems(); // drop all items
player.getItemAssistant().deleteAllItems(); // delete all items
if (!player.isSkulled) { // add the kept items once we if (!player.isSkulled) { // add the kept items once we finish deleting and dropping them
// finish deleting and dropping for (int i1 = 0; i1 < 3; i1++) {
// them if (player.itemKeptId[i1] > 0) {
for (int i1 = 0; i1 < 3; i1++) { player.getItemAssistant().addItem(player.itemKeptId[i1], 1);
if (player.itemKeptId[i1] > 0) {
player.getItemAssistant().addItem(
player.itemKeptId[i1], 1);
}
}
}
if (player.getPrayer().prayerActive[10]) { // if we have
// protect items
if (player.itemKeptId[3] > 0) {
player.getItemAssistant().addItem(
player.itemKeptId[3], 1);
} }
} }
} }
player.getItemAssistant().resetKeepItems(); if (player.getPrayer().prayerActive[10]) { // if we have protect items
if (player.itemKeptId[3] > 0) {
player.getItemAssistant().addItem(player.itemKeptId[3], 1);
}
}
} }
player.getItemAssistant().resetKeepItems();
} }
PrayerDrain.resetPrayers(player); PrayerDrain.resetPrayers(player);
for (int i = 0; i < 20; i++) { for (int i = 0; i < 20; i++) {
CompiledServer/production/2006rebotted/com/rebotted/game/players/PlayerAssistant.class
BIN
View File
Binary file not shown.