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

Open player shop

Browse Source
This commit is contained in:
RedSparr0w
2019-11-22 20:46:39 +13:00
parent 23081c0eac
commit 544f266c8f
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/redone/game/players/Trading.java
+13 -4
View File
@@ -36,19 +36,28 @@ public class Trading {
if (id == player.playerId) { if (id == player.playerId) {
return; return;
} }
// player owned shop
if (o.isBot && o.myShopId >= 0){
if (isCloseTo(o)) {
player.getShopAssistant().openShop(o.myShopId);
} else {
player.getActionSender().sendMessage("Player is not close enough. Retry when you are closer...");
}
return;
}
player.tradeWith = id; player.tradeWith = id;
if (player.isBotting) { if (player.isBotting) {
player.getActionSender().sendMessage("You can't trade items, until you confirm you aren't botting."); player.getActionSender().sendMessage("You can't trade items, until you confirm you aren't botting.");
player.getActionSender().sendMessage("If you need to you can type ::amibotting, to see if your botting."); player.getActionSender().sendMessage("If you need to you can type ::amibotting, to see if your botting.");
return; return;
} }
/*if (c.connectedFrom.equals(o.connectedFrom)) {
c.getActionSender().sendMessage("You cannot trade your own IP.");
return;
}*/
if (!CastleWars.deleteCastleWarsItems(player, id)) { if (!CastleWars.deleteCastleWarsItems(player, id)) {
return; return;
} }
if (!player.inTrade && o.tradeRequested && o.tradeWith == player.playerId && player.playerIsBusy() == false && o.playerIsBusy() == false) { //start trading process if (!player.inTrade && o.tradeRequested && o.tradeWith == player.playerId && player.playerIsBusy() == false && o.playerIsBusy() == false) { //start trading process
if (!isCloseTo(o)) { if (!isCloseTo(o)) {
player.getActionSender().sendMessage("Player is not close enough. Retry when you are closer..."); player.getActionSender().sendMessage("Player is not close enough. Retry when you are closer...");