mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-17 22:01:26 +01:00
40 lines
2.1 KiB
Diff
40 lines
2.1 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
|
Date: Fri, 3 Jul 2020 15:03:33 -0700
|
||
|
|
Subject: [PATCH] added EntityTargetLivingEntityEvent to 1.16 mobs
|
||
|
|
|
||
|
|
1.16 added a different behavior system for the new mobs
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/BehaviorAttackTargetForget.java b/src/main/java/net/minecraft/server/BehaviorAttackTargetForget.java
|
||
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/BehaviorAttackTargetForget.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/BehaviorAttackTargetForget.java
|
||
|
|
@@ -0,0 +0,0 @@ public class BehaviorAttackTargetForget<E extends EntityInsentient> extends Beha
|
||
|
|
|
||
|
|
protected void a(WorldServer worldserver, E e0, long i) {
|
||
|
|
if (a((EntityLiving) e0)) {
|
||
|
|
- this.d(e0);
|
||
|
|
+ handleEvent(e0, org.bukkit.event.entity.EntityTargetEvent.TargetReason.FORGOT_TARGET); // Paper
|
||
|
|
} else if (this.c(e0)) {
|
||
|
|
- this.d(e0);
|
||
|
|
+ handleEvent(e0, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_DIED); // Paper
|
||
|
|
} else if (this.a(e0)) {
|
||
|
|
- this.d(e0);
|
||
|
|
+ handleEvent(e0, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_OTHER_LEVEL); // Paper
|
||
|
|
} else if (!IEntitySelector.f.test(this.b(e0))) {
|
||
|
|
- this.d(e0);
|
||
|
|
+ handleEvent(e0, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_INVALID); // Paper
|
||
|
|
} else if (this.b.test(this.b(e0))) {
|
||
|
|
- this.d(e0);
|
||
|
|
+ handleEvent(e0, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_INVALID); // Paper
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ // Paper start
|
||
|
|
+ private void handleEvent(E entity, org.bukkit.event.entity.EntityTargetEvent.TargetReason reason) {
|
||
|
|
+ org.bukkit.event.entity.EntityTargetLivingEntityEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTargetLivingEvent(entity, null, reason);
|
||
|
|
+ if (!event.isCancelled()) {
|
||
|
|
+ this.d(entity);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|