SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Upstream (Bukkit/CraftBukkit) (#8740)

Browse Source 
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
d352d965 SPIGOT-7221: Add Enemy (Entity) interface

CraftBukkit Changes:
397c5557c SPIGOT-7221: Add Enemy (Entity) interface
a0d3dfaf2 PR-1129: Fix state corruption while handling explosion damage on EntityComplexPart
d67777f8b SPIGOT-7218: Player's outer layer of skin disappears after respawn
This commit is contained in:
Jake Potrebic
2023-01-01 12:17:40 -08:00
parent f7f8d3c75b
commit 9473cd8981
16 changed files with 17 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patches/api/Add-PhantomPreSpawnEvent.patch
View File

@@ -54,7 +54,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
/**
* Represents a phantom.
*/
@@ -0,0 +0,0 @@ public interface Phantom extends Flying {
@@ -0,0 +0,0 @@ public interface Phantom extends Flying, Enemy {
* @param sz The new size of the phantom.
*/
public void setSize(int sz);

2
patches/api/Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
View File

@@ -38,7 +38,7 @@ diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bu
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/entity/Phantom.java
+++ b/src/main/java/org/bukkit/entity/Phantom.java
@@ -0,0 +0,0 @@ public interface Phantom extends Flying {
@@ -0,0 +0,0 @@ public interface Phantom extends Flying, Enemy {
*/
@Nullable
public java.util.UUID getSpawningEntity();

2
patches/api/Allow-to-change-the-podium-of-the-EnderDragon.patch
View File

@@ -8,7 +8,7 @@ diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/or
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/entity/EnderDragon.java
+++ b/src/main/java/org/bukkit/entity/EnderDragon.java
@@ -0,0 +0,0 @@ public interface EnderDragon extends ComplexLivingEntity, Boss, Mob {
@@ -0,0 +0,0 @@ public interface EnderDragon extends ComplexLivingEntity, Boss, Mob, Enemy {
* @return this dragon's death animation ticks
*/
int getDeathAnimationTicks();

2
patches/api/Fix-issues-with-mob-conversion.patch
View File

@@ -8,7 +8,7 @@ diff --git a/src/main/java/org/bukkit/entity/Hoglin.java b/src/main/java/org/buk
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/entity/Hoglin.java
+++ b/src/main/java/org/bukkit/entity/Hoglin.java
@@ -0,0 +0,0 @@ public interface Hoglin extends Animals {
@@ -0,0 +0,0 @@ public interface Hoglin extends Animals, Enemy {
public int getConversionTime();
/**

2
patches/api/Fix-upstream-javadocs.patch
View File

@@ -170,7 +170,7 @@ diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukk
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/entity/Slime.java
+++ b/src/main/java/org/bukkit/entity/Slime.java
@@ -0,0 +0,0 @@ public interface Slime extends Mob {
@@ -0,0 +0,0 @@ public interface Slime extends Mob, Enemy {
public int getSize();
/**

4
patches/api/Missing-Entity-Behavior-API.patch
View File

@@ -462,7 +462,7 @@ diff --git a/src/main/java/org/bukkit/entity/Ghast.java b/src/main/java/org/bukk
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/entity/Ghast.java
+++ b/src/main/java/org/bukkit/entity/Ghast.java
@@ -0,0 +0,0 @@ public interface Ghast extends Flying {
@@ -0,0 +0,0 @@ public interface Ghast extends Flying, Enemy {
* @param flag Whether the Ghast is charging
*/
void setCharging(boolean flag);
@@ -686,7 +686,7 @@ diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bu
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/entity/Phantom.java
+++ b/src/main/java/org/bukkit/entity/Phantom.java
@@ -0,0 +0,0 @@ public interface Phantom extends Flying {
@@ -0,0 +0,0 @@ public interface Phantom extends Flying, Enemy {
* @param shouldBurnInDay True to burn in sunlight
*/
public void setShouldBurnInDay(boolean shouldBurnInDay);

2
patches/api/Slime-Pathfinder-Events.patch
View File

@@ -194,7 +194,7 @@ diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukk
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/entity/Slime.java
+++ b/src/main/java/org/bukkit/entity/Slime.java
@@ -0,0 +0,0 @@ public interface Slime extends Mob {
@@ -0,0 +0,0 @@ public interface Slime extends Mob, Enemy {
* @param sz The new size of the slime.
*/
public void setSize(int sz);