MagicBane/Server
Template
434
1
Fork 5
Code Issues 6 Pull Requests Projects Releases Wiki Activity

PVE flag

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-03-08 07:08:34 -06:00
parent 44b5e8cfd9
commit 4b6b209188
2 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/CharacterTitle.java
+10 -10
View File
@@ -21,7 +21,7 @@ public enum CharacterTitle {
CSR_3(255, 0, 0, "CCR"), CSR_3(255, 0, 0, "CCR"),
CSR_4(251, 181, 13, "CCR"), CSR_4(251, 181, 13, "CCR"),
DEVELOPER(166, 153, 114, "Programmer"), DEVELOPER(166, 153, 114, "Programmer"),
PVE(0, 255, 0, ""), PVE(0, 255, 0, "PvE"),
QA(88, 250, 244, "GIRLFRIEND"); QA(88, 250, 244, "GIRLFRIEND");
int headerLength, footerLength; int headerLength, footerLength;
@@ -72,10 +72,10 @@ public enum CharacterTitle {
char[] chars = firstName.toCharArray(); char[] chars = firstName.toCharArray();
if (smallString) if (smallString)
writer.put((byte) (chars.length + this.headerLength)); writer.put((byte) (chars.length + this.footerLength));
else else
writer.putInt(chars.length + this.headerLength); writer.putInt(chars.length + this.footerLength);
writer.putBB(header); writer.putBB(footer);
for (char c : chars) { for (char c : chars) {
writer.putChar(c); writer.putChar(c);
@@ -101,21 +101,21 @@ public enum CharacterTitle {
char[] chars = lastName.toCharArray(); char[] chars = lastName.toCharArray();
if (smallString) if (smallString)
writer.put((byte) (chars.length + this.footerLength)); writer.put((byte) (chars.length + this.headerLength));
else else
writer.putInt(chars.length + this.footerLength); writer.putInt(chars.length + this.headerLength);
for (char c : chars) { for (char c : chars) {
writer.putChar(c); writer.putChar(c);
} }
writer.putBB(footer); writer.putBB(header);
} else { } else {
if (smallString) if (smallString)
writer.put((byte) this.footerLength); writer.put((byte) this.headerLength);
else else
writer.putInt(this.footerLength); writer.putInt(this.headerLength);
writer.putBB(footer); writer.putBB(header);
} }
} }
src/engine/objects/PlayerCharacter.java
+14 -15
View File
@@ -5199,20 +5199,17 @@ public class PlayerCharacter extends AbstractCharacter {
if (this.isBoxed){// && !this.containsEffect(1672601862)) { if (this.isBoxed){// && !this.containsEffect(1672601862)) {
//PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false); //PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false);
//if(!this.title.equals(CharacterTitle.PVE)){ if(!this.title.equals(CharacterTitle.PVE)){
// this.title = CharacterTitle.PVE; this.title = CharacterTitle.PVE;
// InterestManager.setObjectDirty(this); InterestManager.setObjectDirty(this);
// InterestManager.reloadCharacter(this, false); InterestManager.reloadCharacter(this, false);
//}
if(!this.containsEffect(496607208)){
PowersManager.applyPower(this,this,this.loc,-2133617927,40,false);
} }
}else { }else {
//if (!this.title.equals(CharacterTitle.NONE)) { if (!this.title.equals(CharacterTitle.NONE)) {
// this.title = CharacterTitle.NONE; this.title = CharacterTitle.NONE;
// InterestManager.setObjectDirty(this); InterestManager.setObjectDirty(this);
// InterestManager.reloadCharacter(this, false); InterestManager.reloadCharacter(this, false);
//} }
} }
} }
if (this.isFlying()) { if (this.isFlying()) {
@@ -5269,6 +5266,7 @@ public class PlayerCharacter extends AbstractCharacter {
InterestManager.setObjectDirty(pc); InterestManager.setObjectDirty(pc);
InterestManager.reloadCharacter(pc, true); InterestManager.reloadCharacter(pc, true);
pc.setDirtyLoad(true); pc.setDirtyLoad(true);
//pc.getClientConnection().forceDisconnect();
} }
} }
player.isBoxed = false; player.isBoxed = false;
@@ -5277,10 +5275,11 @@ public class PlayerCharacter extends AbstractCharacter {
InterestManager.setObjectDirty(player); InterestManager.setObjectDirty(player);
InterestManager.reloadCharacter(player, true); InterestManager.reloadCharacter(player, true);
player.setDirtyLoad(true); player.setDirtyLoad(true);
//player.getClientConnection().forceDisconnect();
} }
if (player.containsEffect(1672601862)) { //if (player.containsEffect(1672601862)) {
player.removeEffectBySource(EffectSourceType.DeathShroud, 41, false); // player.removeEffectBySource(EffectSourceType.DeathShroud, 41, false);
} //}
}else{ }else{
ChatManager.chatSystemInfo(player, "All Boxes Must Be In Safezone To Switch"); ChatManager.chatSystemInfo(player, "All Boxes Must Be In Safezone To Switch");
} }