twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 20:52:12 -07:00
Code Issues Packages 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
parent 5a34a7c895
commit d1c10d63dc
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
patches/api/Missing-Entity-API.patch
View File

@@ -705,6 +705,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ */ + */
+ @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 {

10
patches/server/Missing-Entity-API.patch
View File

@@ -850,9 +850,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- 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
@@ -0,0 +0,0 @@ public class CraftPanda extends CraftAnimals implements Panda { @@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java