New stuff again (#190)

* 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.

2006Redone Server/src/redone/game/items/Item.java

@@ -144,7 +144,7 @@ public class Item {
 			"Warrior helm", "Void" };
 	/* Fullmask covers your entire head. */  
 	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" };
 
 	public static boolean isFullBody(int itemId) {

2006Redone Server/src/redone/game/players/Trading.java

@@ -62,7 +62,7 @@ public class Trading {
 				player.getActionSender().sendMessage("Sending trade request...");
 				o.getActionSender()
 						.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.");
 			}
 		} catch (Exception e) {

2006Redone Server/src/redone/net/packets/impl/Walking.java

@@ -53,6 +53,7 @@ public class Walking implements PacketType {
 		}
 		if (player.inTrade) {
 			player.inTrade = false;
+			player.getTrading().declineTrade(true);
 		}
 		if (player.tutorialProgress > 35 && !player.isSmithing) {
 			player.getPlayerAssistant().closeAllWindows();