2021-08-13 20:15:43 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
Date: Sun, 3 Jan 2021 21:25:31 -0800
|
|
|
|
Subject: [PATCH] Make EntityUnleashEvent cancellable
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
|
2023-06-08 04:04:01 +02:00
|
|
|
index 1887b9cd309556eeacac2a5e5cd922560101fa72..b6e48531a2a1316eef786e0476574eb1c3c29a9e 100644
|
2021-08-13 20:15:43 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Mob.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
|
2023-06-08 04:04:01 +02:00
|
|
|
@@ -1543,7 +1543,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
|
2021-08-13 20:15:43 +02:00
|
|
|
if (flag1 && this.isLeashed()) {
|
|
|
|
// Paper start - drop leash variable
|
2023-06-08 04:04:01 +02:00
|
|
|
EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.UNKNOWN, true);
|
|
|
|
- this.level().getCraftServer().getPluginManager().callEvent(event); // CraftBukkit
|
2021-08-13 20:15:43 +02:00
|
|
|
+ if (!event.callEvent()) { return flag1; }
|
|
|
|
this.dropLeash(true, event.isDropLeash());
|
|
|
|
// Paper end
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/PathfinderMob.java b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
|
2023-06-08 04:04:01 +02:00
|
|
|
index a4dfe40d30a5abf5d614d0921b3b23023fdbc4b1..610bc67af915c8ff40a6c8a0d8e022e7db8614d8 100644
|
2021-08-13 20:15:43 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/PathfinderMob.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
|
2021-11-25 00:46:26 +01:00
|
|
|
@@ -51,7 +51,7 @@ public abstract class PathfinderMob extends Mob {
|
2023-06-08 04:04:01 +02:00
|
|
|
if (f > entity.level().paperConfig().misc.maxLeashDistance) { // Paper
|
2021-08-13 20:15:43 +02:00
|
|
|
// Paper start - drop leash variable
|
|
|
|
EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE, true);
|
2023-06-08 04:04:01 +02:00
|
|
|
- this.level().getCraftServer().getPluginManager().callEvent(event); // CraftBukkit
|
2021-08-13 20:15:43 +02:00
|
|
|
+ if (!event.callEvent()) { return; }
|
|
|
|
this.dropLeash(true, event.isDropLeash());
|
|
|
|
// Paper end
|
|
|
|
}
|
2021-11-25 00:46:26 +01:00
|
|
|
@@ -63,7 +63,7 @@ public abstract class PathfinderMob extends Mob {
|
2023-06-08 04:04:01 +02:00
|
|
|
if (f > entity.level().paperConfig().misc.maxLeashDistance) { // Paper
|
2021-08-13 20:15:43 +02:00
|
|
|
// Paper start - drop leash variable
|
|
|
|
EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE, true);
|
2023-06-08 04:04:01 +02:00
|
|
|
- this.level().getCraftServer().getPluginManager().callEvent(event); // CraftBukkit
|
|
|
|
+ if (!event.callEvent()) { return; }
|
2021-08-13 20:15:43 +02:00
|
|
|
this.dropLeash(true, event.isDropLeash());
|
|
|
|
// Paper end
|
|
|
|
this.goalSelector.disableControlFlag(Goal.Flag.MOVE);
|