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

New stuff again (#190)

Browse Source 
* Fixes some agreesive monsters that should be unaggressive

Fixes some agreesive monsters that should be unaggressive

* more items

more items

* Update Item.java

* Fixed some items visual bugs - Helmet

Fixed some items visual bugs - Helmet

* Fixed trading issues.

Fuck up players couldnt trade because they were considered busy. Also fixed the trade screen that stays opened even when other player is out of it.

* removed shit that occured while fixing the conflict.

removed shit that occured while fixing the conflict.
This commit is contained in:
Gptaqbc
2019-11-17 14:38:33 -05:00
committed by Daniel Ginovker
parent 8570b5f531
commit e28bada221
3 changed files with 274 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/redone/game/items/Item.java
+1 -1
View File
@@ -144,7 +144,7 @@ public class Item {
"Warrior helm", "Void" }; "Warrior helm", "Void" };
/* Fullmask covers your entire head. */ /* Fullmask covers your entire head. */
private static String[] fullmask = { "full helm(t)", "full helm(g)", "full helm", "mask", "Verac's helm", private static String[] fullmask = { "full helm(t)", "full helm(g)", "full helm", "mask", "Verac's helm",
"Guthan's helm", "Karil's coif", "mask", "Torag's helm", "Void", "Guthan's helm", "Karil's coif", "mask", "Torag's helm", "Void", "helmet",
"sallet", "Facemask" }; "sallet", "Facemask" };
public static boolean isFullBody(int itemId) { public static boolean isFullBody(int itemId) {
2006Redone Server/src/redone/game/players/Trading.java
+1 -1
View File
@@ -62,7 +62,7 @@ public class Trading {
player.getActionSender().sendMessage("Sending trade request..."); player.getActionSender().sendMessage("Sending trade request...");
o.getActionSender() o.getActionSender()
.sendMessage(player.playerName + ":tradereq:"); .sendMessage(player.playerName + ":tradereq:");
} else if (player.playerIsBusy() == false && o.playerIsBusy() == true) { } else if (player.playerIsBusy() == true || o.playerIsBusy() == true) {
player.getActionSender().sendMessage("Other player is busy at the moment."); player.getActionSender().sendMessage("Other player is busy at the moment.");
} }
} catch (Exception e) { } catch (Exception e) {
2006Redone Server/src/redone/net/packets/impl/Walking.java
+1
View File
@@ -53,6 +53,7 @@ public class Walking implements PacketType {
} }
if (player.inTrade) { if (player.inTrade) {
player.inTrade = false; player.inTrade = false;
player.getTrading().declineTrade(true);
} }
if (player.tutorialProgress > 35 && !player.isSmithing) { if (player.tutorialProgress > 35 && !player.isSmithing) {
player.getPlayerAssistant().closeAllWindows(); player.getPlayerAssistant().closeAllWindows();