1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Sat, 22 Jun 2024 21:17:54 +0200
Subject: [PATCH] Leashable API
diff --git a/src/main/java/io/papermc/paper/entity/PaperLeashable.java b/src/main/java/io/papermc/paper/entity/PaperLeashable.java
new file mode 100644
index 0000000000000000000000000000000000000000..a9ddf9a4a07cd29833f38d7e5f42b2b14ec98f78
--- /dev/null
+++ b/src/main/java/io/papermc/paper/entity/PaperLeashable.java
@@ -0,0 +1,50 @@
+package io.papermc.paper.entity;
+
+import com.google.common.base.Preconditions;
+import net.minecraft.world.entity.Leashable;
+import org.bukkit.craftbukkit.entity.CraftEntity;
+import org.bukkit.entity.Entity;
+
+public interface PaperLeashable extends io.papermc.paper.entity.Leashable {
+
+ Leashable getHandle();
+
+ @Override
+ default boolean isLeashed() {
+ return this.getHandle().getLeashHolder() != null;
+ }
+
+ @Override
+ default Entity getLeashHolder() throws IllegalStateException {
+ Preconditions.checkState(this.isLeashed(), "Entity not leashed");
+ return this.getHandle().getLeashHolder().getBukkitEntity();
+ }
+
+ private boolean unleash() {
+ if (!this.isLeashed()) {
+ return false;
+ }
+
+ this.getHandle().dropLeash(true, false);
+ return true;
+ }
+
+ @Override
+ default boolean setLeashHolder(Entity holder) {
+ if (this.getHandle() instanceof net.minecraft.world.entity.Entity entity && entity.generation) {
+ return false;
+ }
+
+ if (holder == null) {
+ return this.unleash();
+ }
+
+ if (holder.isDead()) {
+ return false;
+ }
+
+ this.unleash();
+ this.getHandle().setLeashedTo(((CraftEntity) holder).getHandle(), true);
+ return true;
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
index 412fd9e87ec81cf50cb8bc82fe2dad5dd0029039..9046d6fa36b9f5e5d25835ad8d94c869c0764060 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
@@ -8,7 +8,7 @@ import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Boat;
import org.bukkit.entity.Entity;
-public abstract class CraftBoat extends CraftVehicle implements Boat {
+public abstract class CraftBoat extends CraftVehicle implements Boat, io.papermc.paper.entity.PaperLeashable { // Paper - Leashable API
public CraftBoat(CraftServer server, AbstractBoat entity) {
super(server, entity);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index f16067b674118a47735ad22797988d50b4415040..d0c409f4efad289e3e325f44b500fc72589d89d4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -784,43 +784,17 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@Override
public boolean isLeashed() {
- if (!(this.getHandle() instanceof Mob)) {
- return false;
- }
- return ((Mob) this.getHandle()).getLeashHolder() != null;
+ return false; // Paper - implement in CraftMob & PaperLeashable
}
@Override
public Entity getLeashHolder() throws IllegalStateException {
- Preconditions.checkState(this.isLeashed(), "Entity not leashed");
- return ((Mob) this.getHandle()).getLeashHolder().getBukkitEntity();
- }
-
- private boolean unleash() {
- if (!this.isLeashed()) {
- return false;
- }
- ((Mob) this.getHandle()).dropLeash(true, false);
- return true;
+ throw new IllegalStateException("Entity not leashed"); // Paper - implement in CraftMob & PaperLeashable
}
@Override
public boolean setLeashHolder(Entity holder) {
- if (this.getHandle().generation || (this.getHandle() instanceof WitherBoss) || !(this.getHandle() instanceof Mob)) {
- return false;
- }
-
- if (holder == null) {
- return this.unleash();
- }
-
- if (holder.isDead()) {
- return false;
- }
-
- this.unleash();
- ((Mob) this.getHandle()).setLeashedTo(((CraftEntity) holder).getHandle(), true);
- return true;
+ return false; // Paper - implement in CraftMob & PaperLeashable
}
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
index 95d7015a61098d1d22a501124d6bb8fba1516fe3..778a9d3f8bfe5dba59e1e655e4eeb8822678b8cf 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
@@ -11,7 +11,7 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Mob;
import org.bukkit.loot.LootTable;
-public abstract class CraftMob extends CraftLivingEntity implements Mob {
+public abstract class CraftMob extends CraftLivingEntity implements Mob, io.papermc.paper.entity.PaperLeashable { // Paper - Leashable API
public CraftMob(CraftServer server, net.minecraft.world.entity.Mob entity) {
super(server, entity);
paperPathfinder = new com.destroystokyo.paper.entity.PaperPathfinder(entity); // Paper - Mob Pathfinding API
@@ -175,4 +175,21 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
return getHandle().getExperienceReward((net.minecraft.server.level.ServerLevel) this.getHandle().level(), null);
}
// Paper end
+
+ // Paper start - Leashable API
+ @Override
+ public boolean isLeashed() {
+ return io.papermc.paper.entity.PaperLeashable.super.isLeashed();
+ }
+
+ @Override
+ public org.bukkit.entity.Entity getLeashHolder() throws IllegalStateException {
+ return io.papermc.paper.entity.PaperLeashable.super.getLeashHolder();
+ }
+
+ @Override
+ public boolean setLeashHolder(final org.bukkit.entity.Entity holder) {
+ return io.papermc.paper.entity.PaperLeashable.super.setLeashHolder(holder);
+ }
+ // Paper end - Leashable API
}
|
