FatBoy/lakebane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 1 Pull Requests Projects Releases Wiki Activity

fix spawning under runegates

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-03-25 19:15:38 -05:00
parent f10467aa9a
commit 18cb4d3f30
2 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/PlayerCharacter.java
+30 -31
View File
@@ -5181,20 +5181,15 @@ public class PlayerCharacter extends AbstractCharacter {
this.safeZone = this.isInSafeZone(); this.safeZone = this.isInSafeZone();
if(this.isActive && this.enteredWorld) { if(this.isActive && this.enteredWorld)
if (this.level < 10)
if (this.level < 10 && this.enteredWorld) { while (this.level < 10)
while (this.level < 10) {
grantXP(Experience.getBaseExperience(this.level + 1) - this.exp); grantXP(Experience.getBaseExperience(this.level + 1) - this.exp);
}
}
}
this.auditBoxedStatus(); this.auditBoxedStatus();
if (this.isFlying()) { if (this.isFlying())
this.auditFlightStatus(); this.auditFlightStatus();
}
} catch (Exception e) { } catch (Exception e) {
Logger.error(e); Logger.error(e);
@@ -5209,33 +5204,31 @@ public class PlayerCharacter extends AbstractCharacter {
public void auditBoxedStatus(){ public void auditBoxedStatus(){
if (!this.timestamps.containsKey("nextBoxCheck")) if (!this.timestamps.containsKey("nextBoxCheck")) {
this.timestamps.put("nextBoxCheck", System.currentTimeMillis() + 3000); this.timestamps.put("nextBoxCheck", System.currentTimeMillis());
return;
if(this.timestamps.get("nextBoxCheck") < System.currentTimeMillis()) {
if (!this.isBoxed) {
this.isBoxed = checkIfBoxed(this);
}
this.timestamps.put("nextBoxCheck", System.currentTimeMillis() + 3000);
} }
if (this.isBoxed && !this.containsEffect(-654906771)) { if(this.timestamps.get("nextBoxCheck") > System.currentTimeMillis())
PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, -935138707, 40, false); return;
}else if(!this.isBoxed && this.containsEffect(-654906771)){
try {
this.effects.get("PvE-Flagged").endEffect();
//this.effects.remove("PvE-Flagged");
}catch(Exception ignored){
} this.timestamps.put("nextBoxCheck", System.currentTimeMillis() + 3000);
try{
this.effects.get("1258").endEffect();
//this.effects.remove("1258");
}catch(Exception ignored){
if(this.isBoxed){
if(!this.containsEffect(-654906771))
PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, -935138707, 40, false);
}else{
if(this.containsEffect(-654906771)){
try{
this.effects.get("1258").endEffect();
//this.effects.remove("1258");
}catch(Exception ignored){
}
} }
} }
} }
public void auditFlightStatus(){ public void auditFlightStatus(){
if (this.effects.containsKey("MoveBuff")) { if (this.effects.containsKey("MoveBuff")) {
GroundPlayer(this); GroundPlayer(this);
@@ -5256,6 +5249,7 @@ public class PlayerCharacter extends AbstractCharacter {
} }
} }
} }
public static void unboxPlayer(PlayerCharacter player){ public static void unboxPlayer(PlayerCharacter player){
String machineID = player.getClientConnection().machineID; String machineID = player.getClientConnection().machineID;
ArrayList<PlayerCharacter> sameMachine = new ArrayList<>(); ArrayList<PlayerCharacter> sameMachine = new ArrayList<>();
@@ -5266,12 +5260,17 @@ public class PlayerCharacter extends AbstractCharacter {
} }
for (PlayerCharacter pc : sameMachine) { for (PlayerCharacter pc : sameMachine) {
PowersManager.applyPower(pc, pc, Vector3fImmutable.ZERO, -935138707, 40, false);
pc.isBoxed = true; pc.isBoxed = true;
pc.auditBoxedStatus();
} }
player.isBoxed = false; player.isBoxed = false;
player.auditBoxedStatus(); try{
player.effects.get("1258").endEffect();
//this.effects.remove("1258");
}catch(Exception ignored){
}
} }
public static boolean checkIfBoxed(PlayerCharacter player){ public static boolean checkIfBoxed(PlayerCharacter player){
if(ConfigManager.MB_WORLD_BOXLIMIT.getValue().equals("false")) { if(ConfigManager.MB_WORLD_BOXLIMIT.getValue().equals("false")) {
src/engine/objects/Portal.java
+2 -1
View File
@@ -6,6 +6,7 @@ import engine.InterestManagement.WorldGrid;
import engine.gameManager.ConfigManager; import engine.gameManager.ConfigManager;
import engine.job.JobScheduler; import engine.job.JobScheduler;
import engine.jobs.CloseGateJob; import engine.jobs.CloseGateJob;
import engine.math.Vector3f;
import engine.math.Vector3fImmutable; import engine.math.Vector3fImmutable;
import engine.server.MBServerStatics; import engine.server.MBServerStatics;
@@ -104,7 +105,7 @@ public class Portal {
if (player.getTimeStamp("lastMoveGate") < this.lastActive) if (player.getTimeStamp("lastMoveGate") < this.lastActive)
return; return;
player.teleport(targetGate.getLoc()); player.teleport(targetGate.getLoc().add(new Vector3f(0f,6f,0f)));
player.setSafeMode(); player.setSafeMode();
} }