diff --git a/src/engine/objects/CharacterTitle.java b/src/engine/objects/CharacterTitle.java index d0ac1cd4..4cb8b6db 100644 --- a/src/engine/objects/CharacterTitle.java +++ b/src/engine/objects/CharacterTitle.java @@ -21,7 +21,7 @@ public enum CharacterTitle { CSR_3(255, 0, 0, "CCR"), CSR_4(251, 181, 13, "CCR"), DEVELOPER(166, 153, 114, "Programmer"), - PVE(0, 255, 0, ""), + PVE(0, 255, 0, "PvE"), QA(88, 250, 244, "GIRLFRIEND"); int headerLength, footerLength; @@ -72,10 +72,10 @@ public enum CharacterTitle { char[] chars = firstName.toCharArray(); if (smallString) - writer.put((byte) (chars.length + this.headerLength)); + writer.put((byte) (chars.length + this.footerLength)); else - writer.putInt(chars.length + this.headerLength); - writer.putBB(header); + writer.putInt(chars.length + this.footerLength); + writer.putBB(footer); for (char c : chars) { writer.putChar(c); @@ -101,21 +101,21 @@ public enum CharacterTitle { char[] chars = lastName.toCharArray(); if (smallString) - writer.put((byte) (chars.length + this.footerLength)); + writer.put((byte) (chars.length + this.headerLength)); else - writer.putInt(chars.length + this.footerLength); + writer.putInt(chars.length + this.headerLength); for (char c : chars) { writer.putChar(c); } - writer.putBB(footer); + writer.putBB(header); } else { if (smallString) - writer.put((byte) this.footerLength); + writer.put((byte) this.headerLength); else - writer.putInt(this.footerLength); - writer.putBB(footer); + writer.putInt(this.headerLength); + writer.putBB(header); } } diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java index a7d25015..ef4620c7 100644 --- a/src/engine/objects/PlayerCharacter.java +++ b/src/engine/objects/PlayerCharacter.java @@ -5199,20 +5199,17 @@ public class PlayerCharacter extends AbstractCharacter { if (this.isBoxed){// && !this.containsEffect(1672601862)) { //PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false); - //if(!this.title.equals(CharacterTitle.PVE)){ - // this.title = CharacterTitle.PVE; - // InterestManager.setObjectDirty(this); - // InterestManager.reloadCharacter(this, false); - //} - if(!this.containsEffect(496607208)){ - PowersManager.applyPower(this,this,this.loc,-2133617927,40,false); + if(!this.title.equals(CharacterTitle.PVE)){ + this.title = CharacterTitle.PVE; + InterestManager.setObjectDirty(this); + InterestManager.reloadCharacter(this, false); } }else { - //if (!this.title.equals(CharacterTitle.NONE)) { - // this.title = CharacterTitle.NONE; - // InterestManager.setObjectDirty(this); - // InterestManager.reloadCharacter(this, false); - //} + if (!this.title.equals(CharacterTitle.NONE)) { + this.title = CharacterTitle.NONE; + InterestManager.setObjectDirty(this); + InterestManager.reloadCharacter(this, false); + } } } if (this.isFlying()) { @@ -5269,6 +5266,7 @@ public class PlayerCharacter extends AbstractCharacter { InterestManager.setObjectDirty(pc); InterestManager.reloadCharacter(pc, true); pc.setDirtyLoad(true); + //pc.getClientConnection().forceDisconnect(); } } player.isBoxed = false; @@ -5277,10 +5275,11 @@ public class PlayerCharacter extends AbstractCharacter { InterestManager.setObjectDirty(player); InterestManager.reloadCharacter(player, true); player.setDirtyLoad(true); + //player.getClientConnection().forceDisconnect(); } - if (player.containsEffect(1672601862)) { - player.removeEffectBySource(EffectSourceType.DeathShroud, 41, false); - } + //if (player.containsEffect(1672601862)) { + // player.removeEffectBySource(EffectSourceType.DeathShroud, 41, false); + //} }else{ ChatManager.chatSystemInfo(player, "All Boxes Must Be In Safezone To Switch"); }