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.
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
@@ -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) {