Browse Source

box check

lakebane-master
FatBoy-DOTC 8 months ago
parent
commit
ee5c254de4
  1. 10
      src/engine/InterestManagement/InterestManager.java
  2. 6
      src/engine/objects/PlayerCharacter.java

10
src/engine/InterestManagement/InterestManager.java

@ -530,15 +530,7 @@ public enum InterestManager implements Runnable {
player.setDirtyLoad(true); player.setDirtyLoad(true);
updateStaticList(player, origin); updateStaticList(player, origin);
updateMobileList(player, origin); updateMobileList(player, origin);
player.isBoxed = PlayerCharacter.checkIfBoxed(player);
//if(player.level < 10) {
//player.setLevel((short) 10);
//MobLoot conc = new MobLoot(player,ItemBase.getItemBase(980066),false);
//player.getCharItemManager().addItemToInventory(conc);
//player.getCharItemManager().addItemToInventory(conc.promoteToItem(player),1);
//player.getCharItemManager().updateInventory();
// }
player.isBoxed = false;
} }

6
src/engine/objects/PlayerCharacter.java

@ -4844,9 +4844,6 @@ public class PlayerCharacter extends AbstractCharacter {
ItemFactory.fillInventory(this, 980066, 1); ItemFactory.fillInventory(this, 980066, 1);
} }
} }
if(this.isBoxed == false){
this. isBoxed = checkIfBoxed(this);
}
if(this.isBoxed && this.containsEffect(1672601862) == false) {//Deathshroud if(this.isBoxed && this.containsEffect(1672601862) == false) {//Deathshroud
PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false); PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false);
@ -4864,13 +4861,14 @@ public class PlayerCharacter extends AbstractCharacter {
public static boolean checkIfBoxed(PlayerCharacter player){ public static boolean checkIfBoxed(PlayerCharacter player){
try { try {
for (PlayerCharacter pc : SessionManager.getAllActivePlayers()) { for (PlayerCharacter pc : SessionManager.getAllActivePlayers()) {
if(pc.getClientConnection().machineID.equals(player.getClientConnection().machineID) == false)
continue;
if (!pc.isActive) if (!pc.isActive)
continue; continue;
if (!pc.enteredWorld) if (!pc.enteredWorld)
continue; continue;
if (pc.equals(player)) if (pc.equals(player))
continue; continue;
if (pc.getClientConnection().machineID.equals(player.getClientConnection().machineID))
if (pc.isBoxed == false) if (pc.isBoxed == false)
return true; return true;

Loading…
Cancel
Save