Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-7957: Fix setTarget method for Breeze

Browse Source
This commit is contained in:
Doc 2024-11-17 11:22:36 +11:00 committed by md_5
parent 5bc0a094b3
commit a71a7e1f57
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nms-patches/net/minecraft/world/entity/monster/breeze/Breeze.patch Normal file
View File

@ -0,0 +1,19 @@
--- a/net/minecraft/world/entity/monster/breeze/Breeze.java
+++ b/net/minecraft/world/entity/monster/breeze/Breeze.java
@@ -77,7 +77,7 @@
@Override
public BehaviorController<Breeze> getBrain() {
- return super.getBrain();
+ return (BehaviorController<Breeze>) super.getBrain(); // CraftBukkit - decompile error
}
@Override
@@ -255,6 +255,7 @@
@Override
public boolean canAttackType(EntityTypes<?> entitytypes) {
+ if (this.getTarget() != null) return this.getTarget().getType() == entitytypes; // SPIGOT-7957: Allow attack if target from brain was set
return entitytypes == EntityTypes.PLAYER || entitytypes == EntityTypes.IRON_GOLEM;
}

10
src/main/java/org/bukkit/craftbukkit/entity/CraftBreeze.java
View File

@ -1,7 +1,10 @@
package org.bukkit.craftbukkit.entity;
import net.minecraft.world.entity.EntityLiving;
import net.minecraft.world.entity.ai.memory.MemoryModuleType;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Breeze;
import org.bukkit.entity.LivingEntity;
public class CraftBreeze extends CraftMonster implements Breeze {
@ -14,6 +17,13 @@ public class CraftBreeze extends CraftMonster implements Breeze {
return (net.minecraft.world.entity.monster.breeze.Breeze) entity;
}
@Override
public void setTarget(LivingEntity target) {
super.setTarget(target);
EntityLiving entityLivingTarget = (target instanceof CraftLivingEntity craftLivingEntity) ? craftLivingEntity.getHandle() : null;
this.getHandle().getBrain().setMemory(MemoryModuleType.ATTACK_TARGET, entityLivingTarget); // SPIGOT-7957: We need override memory for set target and trigger attack behaviours
}
@Override
public String toString() {
return "CraftBreeze";