Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-22 17:07:34 +01:00
Code Issues Projects Releases Wiki Activity

Add entity API for getting the combined gene of a Panda (#9891)

Browse Source
This commit is contained in:
booky10 2023-11-04 21:28:23 +01:00 committed by GitHub
parent bffb08c2f9
commit 43c343228e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
patches/api/0299-Missing-Entity-API.patch
View File

@ -619,10 +619,10 @@ index 939a3dbfcf38f38e4e39d28973ef723157ce0a50..738d547d2a6966122cb2f9f6e94263ee
+ // Paper end + // Paper end
} }
diff --git a/src/main/java/org/bukkit/entity/Panda.java b/src/main/java/org/bukkit/entity/Panda.java diff --git a/src/main/java/org/bukkit/entity/Panda.java b/src/main/java/org/bukkit/entity/Panda.java
index 1f027927a1194f4f8e86c1375a2772e6e261c151..57cf24cfd15a541f60aafc8507c189344aead0f7 100644 index 1f027927a1194f4f8e86c1375a2772e6e261c151..aa5686df134185334a74429576ff0709a604dbfd 100644
--- a/src/main/java/org/bukkit/entity/Panda.java --- a/src/main/java/org/bukkit/entity/Panda.java
+++ b/src/main/java/org/bukkit/entity/Panda.java +++ b/src/main/java/org/bukkit/entity/Panda.java
@@ -107,6 +107,87 @@ public interface Panda extends Animals, Sittable { @@ -107,6 +107,98 @@ public interface Panda extends Animals, Sittable {
*/ */
int getUnhappyTicks(); int getUnhappyTicks();
@ -705,6 +705,17 @@ index 1f027927a1194f4f8e86c1375a2772e6e261c151..57cf24cfd15a541f60aafc8507c18934
+ */ + */
+ @Override + @Override
+ boolean isSitting(); + boolean isSitting();
+
+ /**
+ * Gets this Panda's combined gene.
+ * <p>
+ * The combined gene can be modified using
+ * {@link #setMainGene(Gene)} or {@link #setHiddenGene(Gene)}.
+ *
+ * @return combined gene
+ */
+ @NotNull
+ Gene getCombinedGene();
+ // Paper end - Panda API + // Paper end - Panda API
+ +
public enum Gene { public enum Gene {

14
patches/server/0625-Missing-Entity-API.patch
View File

@ -846,13 +846,13 @@ index 77cede9c565a3bc404878c9a4028cadc90f6c010..ade11598bee28fea252e3500aaa1daef
public String toString() { public String toString() {
return "CraftMushroomCow"; return "CraftMushroomCow";
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java
index 5467e4a74b70ff57b49d9e6bc686c493178f8511..56f9630dbe5d18d5ec33dc85f6531723022d6a3b 100644 index 5467e4a74b70ff57b49d9e6bc686c493178f8511..01d104d91de9e1319d27e39d3f474318c7809486 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPanda.java
@@ -40,6 +40,32 @@ public class CraftPanda extends CraftAnimals implements Panda { @@ -41,6 +41,38 @@ public class CraftPanda extends CraftAnimals implements Panda {
public void setHiddenGene(Gene gene) {
this.getHandle().setHiddenGene(CraftPanda.toNms(gene)); this.getHandle().setHiddenGene(CraftPanda.toNms(gene));
} }
+ // Paper start - Panda API + // Paper start - Panda API
+ @Override + @Override
+ public void setSneezeTicks(int ticks) { + public void setSneezeTicks(int ticks) {
@ -878,10 +878,16 @@ index 5467e4a74b70ff57b49d9e6bc686c493178f8511..56f9630dbe5d18d5ec33dc85f6531723
+ public void setUnhappyTicks(int ticks) { + public void setUnhappyTicks(int ticks) {
+ this.getHandle().setUnhappyCounter(ticks); + this.getHandle().setUnhappyCounter(ticks);
+ } + }
+
+ @Override
+ public Gene getCombinedGene() {
+ return CraftPanda.fromNms(this.getHandle().getVariant());
+ }
+ // Paper end - Panda API + // Paper end - Panda API
+
@Override @Override
public boolean isRolling() { public boolean isRolling() {
return this.getHandle().isRolling();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
index 9304e201db1ec96d0916aa8ea781f3e4bc7991e6..8338effd39b1709dbe578e247710a8e58d83e3aa 100644 index 9304e201db1ec96d0916aa8ea781f3e4bc7991e6..8338effd39b1709dbe578e247710a8e58d83e3aa 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java