coldsore
/
Server
forked from MagicBane/Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

PVE flag

lakebane
FatBoy-DOTC 8 months ago
parent
44b5e8cfd9
commit
4b6b209188
2 changed files with 24 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/engine/objects/CharacterTitle.java
  2. 29
      src/engine/objects/PlayerCharacter.java

20
src/engine/objects/CharacterTitle.java
Unescape 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);
} }
} }

29
src/engine/objects/PlayerCharacter.java
Unescape 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");
} }

Write Preview
Loading…
Cancel
Save