Call reassess tame goals upon read

Mrbysco · Mrbysco · commit aad15a2da934 · 2024-08-09T21:39:56.000+02:00
Remove duplicate removal code
diff --git a/common/src/main/java/net/chococraft/common/entity/AbstractChocobo.java b/common/src/main/java/net/chococraft/common/entity/AbstractChocobo.java
@@ -157,6 +157,7 @@ public void readAdditionalSaveData(CompoundTag compound) {
 			this.setSaddleType(ItemStack.parseOptional(this.registryAccess(), compound.getCompound("wornSaddle")));
 
 		this.setAllowedFlight(compound.getBoolean(NBTKEY_ALLOWED_FLIGHT));
+		this.reassessTameGoals();
 	}
 
 	@Override
@@ -666,10 +667,8 @@ protected void reassessTameGoals() {
 
 		if (isTame()) {
 			goalSelector.addGoal(4, healInPenGoal);
-			goalSelector.removeGoal(chocoboAvoidPlayerGoal);
 		} else {
 			goalSelector.addGoal(5, chocoboAvoidPlayerGoal);
-			goalSelector.removeGoal(healInPenGoal);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,7 @@ public void readAdditionalSaveData(CompoundTag compound) {`
`157`	`157`	`this.setSaddleType(ItemStack.parseOptional(this.registryAccess(), compound.getCompound("wornSaddle")));`
`158`	`158`
`159`	`159`	`this.setAllowedFlight(compound.getBoolean(NBTKEY_ALLOWED_FLIGHT));`
	`160`	`+ this.reassessTameGoals();`
`160`	`161`	`}`
`161`	`162`
`162`	`163`	`@Override`
`@@ -666,10 +667,8 @@ protected void reassessTameGoals() {`
`666`	`667`
`667`	`668`	`if (isTame()) {`
`668`	`669`	`goalSelector.addGoal(4, healInPenGoal);`
`669`		`- goalSelector.removeGoal(chocoboAvoidPlayerGoal);`
`670`	`670`	`} else {`
`671`	`671`	`goalSelector.addGoal(5, chocoboAvoidPlayerGoal);`
`672`		`- goalSelector.removeGoal(healInPenGoal);`
`673`	`672`	`}`
`674`	`673`	`}`
`675`	`674`