yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow bot accounts to trade with other players

Browse Source
This commit is contained in:
ceikry
2021-07-19 08:03:50 -05:00
parent f9e3f4f3b4
commit 0aee3d92f5
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/node/entity/player/link/request/trade/TradeContainer.java
+17 -1
View File
@@ -1,5 +1,6 @@
package core.game.node.entity.player.link.request.trade;
import api.ContentAPI;
import core.cache.def.impl.ItemDefinition;
import core.game.container.*;
import core.game.node.entity.player.Player;
@@ -10,6 +11,8 @@ import core.net.packet.PacketRepository;
import core.net.packet.context.ContainerContext;
import core.net.packet.out.ContainerPacket;
import static rs09.tools.stringtools.StringToolsKt.colorize;
/**
* Represents the container during a trade session.
* @author 'Vexia
@@ -148,10 +151,23 @@ public final class TradeContainer extends Container {
*/
private boolean tradeable(final Item item) {
final ItemDefinition definition = ItemDefinition.forId(item.getId());
Player target = TradeModule.getExtension(player).getTarget();
boolean playerIsBot = player.getAttribute("not_on_highscores",false);
boolean targetIsBot = target.getAttribute("not_on_highscores",false);
String playerIP = player.getDetails().getIpAddress();
String targetIP = target.getDetails().getIpAddress();
String playerMac = player.getDetails().getMacAddress();
String targetMac = target.getDetails().getMacAddress();
String playerHost = player.getDetails().getCompName();
String targetHost = target.getDetails().getCompName();
if (item.getId() == 11174 || item.getId() == 11173 || item.getId() == 759) {
return true;
}
if (player.getIronmanManager().isIronman() || TradeModule.getExtension(player).getTarget() != null && TradeModule.getExtension(player).getTarget().getIronmanManager().isIronman()) {
if (player.getIronmanManager().isIronman() || target != null && target.getIronmanManager().isIronman()) {
return false;
}
if ((playerIsBot || targetIsBot) && (playerIP.equals(targetIP) || playerMac.equals(targetMac) || playerHost.equals(targetHost))){
ContentAPI.sendMessage(player, colorize("%RYou can not trade items with your own bot accounts."));
return false;
}
if (item.getName().equals("Coins") && item.getId() != 995) {