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

New stuff 6 (#324)

Browse Source 
* Some stuff on weight

Some stuff on weight

* Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog

Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog

* removed a shitload of '== true'

I did a search and replace but I manually checked the changes that were made so there shouldn't be any issue with that.
This commit is contained in:
Gptaqbc
2019-12-25 13:01:24 -05:00
committed by Daniel Ginovker
parent 1c2deaacb6
commit 5f500280b2
38 changed files with 157 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/com/rebotted/net/packets/impl/ClickObject.java
+2 -2
View File
@@ -142,7 +142,7 @@ public class ClickObject implements PacketType {
}
switch (p.objectId) {
case 1292:
if (p.spiritTree == false && p.clickedTree == true) {
if (p.spiritTree == false && p.clickedTree) {
p.getPacketSender().sendMessage("You have already spawned a tree spirit.");
return;
}
@@ -150,7 +150,7 @@ public class ClickObject implements PacketType {
p.getPacketSender().sendMessage("You attempt to chop the tree, and a tree spirit appears.");
NpcHandler.spawnNpc(p, 655, p.getX(), p.getY(), 0, 0, 225, 20, 80, 80, true, false);
p.clickedTree = true;
} else if (p.spiritTree == true) {
} else if (p.spiritTree) {
Woodcutting.startWoodcutting(p, p.objectId, p.objectX, p.objectY, p.clickObjectType);
}
break;
2006Redone Server/src/com/rebotted/net/packets/impl/ClickingButtons.java
+31 -31
View File
@@ -57,7 +57,7 @@ public class ClickingButtons implements PacketType {
Climbing.handleLadderButtons(player, actionButtonId);
Specials.specialClicking(player, actionButtonId);
DialogueOptions.handleDialogueOptions(player, actionButtonId);
if (player.musicOn == true) {
if (player.musicOn) {
player.getPlayList().handleButton(actionButtonId);
}
@@ -253,7 +253,7 @@ public class ClickingButtons implements PacketType {
case 34185:
case 34193:
case 34189:
if (player.clickedSpinning == true) {
if (player.clickedSpinning) {
Spinning.getAmount(player, 1);
}
break;
@@ -261,7 +261,7 @@ public class ClickingButtons implements PacketType {
case 34184:
case 34188:
case 34192:
if (player.clickedSpinning == true) {
if (player.clickedSpinning) {
Spinning.getAmount(player, 5);
}
break;
@@ -269,7 +269,7 @@ public class ClickingButtons implements PacketType {
case 34183:
case 34187:
case 34191:
if (player.clickedSpinning == true) {
if (player.clickedSpinning) {
Spinning.getAmount(player, 10);
}
break;
@@ -277,7 +277,7 @@ public class ClickingButtons implements PacketType {
case 34182:
case 34186:
case 34190:
if (player.clickedSpinning == true) {
if (player.clickedSpinning) {
Spinning.getAmount(player, 28);
}
break;
@@ -287,100 +287,100 @@ public class ClickingButtons implements PacketType {
*/
// item 1
case 34245:
if (player.showedUnfire == true) {
if (player.showedUnfire) {
Pottery.makeUnfire(player, 1787, 6.3, 1, 1);
}
if (player.showedFire == true) {
if (player.showedFire) {
Pottery.makeFire(player, 1787, 1931, 1, 6.3, 1);
}
break;
case 34244:
if (player.showedUnfire == true) {
if (player.showedUnfire) {
Pottery.makeUnfire(player, 1787, 6.3, 1, 5);
}
if (player.showedFire == true) {
if (player.showedFire) {
Pottery.makeFire(player, 1787, 1931, 1, 6.3, 5);
}
break;
case 34243:
if (player.showedUnfire == true) {
if (player.showedUnfire) {
Pottery.makeUnfire(player, 1787, 6.3, 1, 10);
}
if (player.showedFire == true) {
if (player.showedFire) {
Pottery.makeFire(player, 1787, 1931, 1, 6.3, 10);
}
break;
case 34242:
if (player.showedUnfire == true) {
if (player.showedUnfire) {
Pottery.makeUnfire(player, 1787, 6.3, 1, 28);
}
if (player.showedFire == true) {
if (player.showedFire) {
Pottery.makeFire(player, 1787, 1931, 1, 6.3, 28);
}
break;
// item 2
case 34249:
if (player.showedUnfire == true) {
if (player.showedUnfire) {
Pottery.makeUnfire(player, 1789, 15, 7, 1);
}
if (player.showedFire == true) {
if (player.showedFire) {
Pottery.makeFire(player, 1789, 2313, 7, 10, 1);
}
break;
case 34248:
if (player.showedUnfire == true) {
if (player.showedUnfire) {
Pottery.makeUnfire(player, 1789, 15, 7, 5);
}
if (player.showedFire == true) {
if (player.showedFire) {
Pottery.makeFire(player, 1789, 2313, 7, 10, 5);
}
break;
case 34247:
if (player.showedUnfire == true) {
if (player.showedUnfire) {
Pottery.makeUnfire(player, 1789, 15, 7, 10);
}
if (player.showedFire == true) {
if (player.showedFire) {
Pottery.makeFire(player, 1789, 2313, 7, 10, 10);
}
break;
case 34246:
if (player.showedUnfire == true) {
if (player.showedUnfire) {
Pottery.makeUnfire(player, 1789, 15, 7, 28);
}
if (player.showedFire == true) {
if (player.showedFire) {
Pottery.makeFire(player, 1789, 2313, 7, 10, 28);
}
break;
// item 3
case 34253:
if (player.showedUnfire == true) {
if (player.showedUnfire) {
Pottery.makeUnfire(player, 1791, 18, 8, 1);
}
if (player.showedFire == true) {
if (player.showedFire) {
Pottery.makeFire(player, 1791, 1923, 8, 15, 1);
}
break;
case 34252:
if (player.showedUnfire == true) {
if (player.showedUnfire) {
Pottery.makeUnfire(player, 1791, 18, 8, 5);
}
if (player.showedFire == true) {
if (player.showedFire) {
Pottery.makeFire(player, 1791, 1923, 8, 15, 5);
}
break;
case 34251:
if (player.showedUnfire == true) {
if (player.showedUnfire) {
Pottery.makeUnfire(player, 1791, 18, 8, 10);
}
if (player.showedFire == true) {
if (player.showedFire) {
Pottery.makeFire(player, 1791, 1923, 8, 15, 10);
}
break;
case 34250:
if (player.showedUnfire == true) {
if (player.showedUnfire) {
Pottery.makeUnfire(player, 1791, 18, 8, 28);
}
if (player.showedFire == true) {
if (player.showedFire) {
Pottery.makeFire(player, 1791, 1923, 8, 15, 28);
}
break;
@@ -623,7 +623,7 @@ public class ClickingButtons implements PacketType {
break;
case 3162:
if (player.musicOn == true) {
if (player.musicOn) {
player.musicOn = false;
} else {
player.getPacketSender().sendMessage("Your music is already turned off.");
@@ -1765,7 +1765,7 @@ public class ClickingButtons implements PacketType {
player.getPacketSender().sendConfig(502, 1);
player.getPacketSender().sendConfig(287, 1);
player.splitChat = true;
} else if (player.splitChat == true) {
} else if (player.splitChat) {
player.getPacketSender().sendConfig(502, 0);
player.getPacketSender().sendConfig(287, 0);
player.splitChat = false;
2006Redone Server/src/com/rebotted/net/packets/impl/DropItem.java
+2 -2
View File
@@ -50,7 +50,7 @@ public class DropItem implements PacketType {
"You can't drop items while trading!");
return;
}
if (player.hasNpc == true) {
if (player.hasNpc) {
player.getPacketSender().sendMessage(
"You already have a pet dropped.");
return;
@@ -96,7 +96,7 @@ public class DropItem implements PacketType {
for (int p : Pets.CAT_ITEMS) {
if (p == itemId) {
if (player.hasNpc == true) {
if (player.hasNpc) {
droppable = false;
break;
}
2006Redone Server/src/com/rebotted/net/packets/impl/ItemOnNpc.java
+1 -1
View File
@@ -23,7 +23,7 @@ public class ItemOnNpc implements PacketType {
player.getPacketSender().sendMessage("Your inventory is full.");
return;
}
if (player == null || player.disconnected == true || !player.getItemAssistant().playerHasItem(itemId, 1, slot) || NpcHandler.npcs[i] == null || NpcHandler.npcs[i].isDead || player.isDead || player.isTeleporting) {
if (player == null || player.disconnected || !player.getItemAssistant().playerHasItem(itemId, 1, slot) || NpcHandler.npcs[i] == null || NpcHandler.npcs[i].isDead || player.isDead || player.isTeleporting) {
return;
}
player.faceNpc(i);
2006Redone Server/src/com/rebotted/net/packets/impl/PickupItem.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class PickupItem implements PacketType {
return;
}
for (LogData logData : LogData.values()) {
if (player.isFiremaking == true && player.pItemId == logData.getLogId()) {
if (player.isFiremaking && player.pItemId == logData.getLogId()) {
player.getPacketSender().sendMessage("You can't do that!");
Firemaking.stopFiremaking = true;
return;
2006Redone Server/src/com/rebotted/net/packets/impl/Walking.java
+5 -5
View File
@@ -42,13 +42,13 @@ public class Walking implements PacketType {
if (player.playerStun) {
return;
}
if (player.stopPlayer == true) {
if (player.stopPlayer) {
return;
}
if (player.isFiremaking == true) {
if (player.isFiremaking) {
player.isFiremaking = false;
}
if (player.stopPlayerPacket == true) {
if (player.stopPlayerPacket) {
return;
}
if (player.inTrade) {
@@ -65,10 +65,10 @@ public class Walking implements PacketType {
if (player.closeTutorialInterface == false && player.tutorialProgress == 36) {
player.getDialogueHandler().sendDialogues(3116, player.npcType);
}
if (player.gliderOpen == true) {
if (player.gliderOpen) {
player.gliderOpen = false;
}
if (player.isBanking == true) {
if (player.isBanking) {
player.isBanking = false;
}
if (player.canWalkTutorial == false && player.tutorialProgress < 36) {