OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 07:20:24 +01:00
Code Issues Projects Releases Packages 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
Show stats 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);

2
patches/server/Add-PhantomPreSpawnEvent.patch
View file

@ -83,7 +83,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
@@ -0,0 +0,0 @@ public class CraftPhantom extends CraftFlying implements Phantom {
@@ -0,0 +0,0 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy {
public EntityType getType() {
return EntityType.PHANTOM;
}

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

@ -113,7 +113,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
@@ -0,0 +0,0 @@ public class CraftPhantom extends CraftFlying implements Phantom {
@@ -0,0 +0,0 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy {
public java.util.UUID getSpawningEntity() {
return getHandle().getSpawningEntity();
}

2
patches/server/Allow-to-change-the-podium-for-the-EnderDragon.patch
View file

@ -126,7 +126,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java b
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderDragon.java
@@ -0,0 +0,0 @@ public class CraftEnderDragon extends CraftMob implements EnderDragon {
@@ -0,0 +0,0 @@ public class CraftEnderDragon extends CraftMob implements EnderDragon, CraftEnem
public int getDeathAnimationTicks() {
return this.getHandle().dragonDeathTime;
}

4
patches/server/Missing-Entity-Behavior-API.patch
View file

@ -702,7 +702,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java b/src/m
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftGhast.java
@@ -0,0 +0,0 @@ public class CraftGhast extends CraftFlying implements Ghast {
@@ -0,0 +0,0 @@ public class CraftGhast extends CraftFlying implements Ghast, CraftEnemy {
public void setCharging(boolean flag) {
this.getHandle().setCharging(flag);
}
@ -904,7 +904,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
@@ -0,0 +0,0 @@ public class CraftPhantom extends CraftFlying implements Phantom {
@@ -0,0 +0,0 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy {
public void setShouldBurnInDay(boolean shouldBurnInDay) {
getHandle().setShouldBurnInDay(shouldBurnInDay);
}

32
patches/server/Reorder-bukkit-damage-source-entity-for-explosion-to.patch
View file

@ -1,32 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Fri, 11 Nov 2022 11:49:40 +0100
Subject: [PATCH] Reorder bukkit damage source entity for explosion to exclude
enderdragon part
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/level/Explosion.java
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
@@ -0,0 +0,0 @@ public class Explosion {
double d13 = (1.0D - d7) * d12;
// CraftBukkit start
- CraftEventFactory.entityDamage = this.source;
- entity.lastDamageCancelled = false;
// Special case ender dragon only give knockback if no damage is cancelled
// Thinks to note:
@@ -0,0 +0,0 @@ public class Explosion {
continue;
}
+ // Paper start - moved from above
+ CraftEventFactory.entityDamage = this.source;
+ entity.lastDamageCancelled = false;
+ // Paper end
+
if (entity instanceof EnderDragon) {
for (EnderDragonPart entityComplexPart : ((EnderDragon) entity).subEntities) {
if (list.contains(entityComplexPart)) {

2
patches/server/Slime-Pathfinder-Events.patch
View file

@ -148,7 +148,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/m
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
@@ -0,0 +0,0 @@ public class CraftSlime extends CraftMob implements Slime {
@@ -0,0 +0,0 @@ public class CraftSlime extends CraftMob implements Slime, CraftEnemy {
public EntityType getType() {
return EntityType.SLIME;
}

2
patches/server/fix-dead-slime-setSize-invincibility.patch
View file

@ -8,7 +8,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/m
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java
@@ -0,0 +0,0 @@ public class CraftSlime extends CraftMob implements Slime {
@@ -0,0 +0,0 @@ public class CraftSlime extends CraftMob implements Slime, CraftEnemy {
@Override
public void setSize(int size) {

2
work/Bukkit

@ -1 +1 @@
Subproject commit aef9b6d2051e45d924d2e2b294fdb700b357bd3c
Subproject commit d352d96500fbd215d06f4561f374faabb1c0b1fd

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit ae8f5fc02595a9a70dab28ad1835c9cd44ddc60d
Subproject commit 397c5557cac66a242573cec11a2966d812b710d2