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

PVE flag

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-03-08 06:32:11 -06:00
parent e1c109cd6c
commit 44b5e8cfd9
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/PowersManager.java
+2 -4
View File
@@ -1932,7 +1932,7 @@ public enum PowersManager {
if (ac.getObjectType().equals(GameObjectType.PlayerCharacter)){ if (ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
PlayerCharacter pc = (PlayerCharacter) ac; PlayerCharacter pc = (PlayerCharacter) ac;
if (pc.isBoxed) { if (pc.isBoxed && pb.token != -2133617927) {
if(AbstractCharacter.IsAbstractCharacter(target)){ if(AbstractCharacter.IsAbstractCharacter(target)){
if (target.getObjectType().equals(GameObjectType.PlayerCharacter)){ if (target.getObjectType().equals(GameObjectType.PlayerCharacter)){
return; return;
@@ -2023,9 +2023,7 @@ public enum PowersManager {
public static void runPowerAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, ActionsBase ab, int trains, PowersBase pb) { public static void runPowerAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, ActionsBase ab, int trains, PowersBase pb) {
AbstractPowerAction pa = ab.getPowerAction(); AbstractPowerAction pa = ab.getPowerAction();
if (pa == null) { if (pa == null) {
Logger.error( Logger.error("runPowerAction(): PowerAction not found of IDString: " + ab.getEffectID());
"runPowerAction(): PowerAction not found of IDString: "
+ ab.getEffectID());
return; return;
} }
pa.startAction(source, awo, targetLoc, trains, ab, pb); pa.startAction(source, awo, targetLoc, trains, ab, pb);
src/engine/objects/PlayerCharacter.java
+12 -9
View File
@@ -5199,17 +5199,20 @@ 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()) {