Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@1e5d1db Call StructureGrowEvent for mangrove propagule (#8023)
PaperMC/Paper@385f313 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8092)
PaperMC/Paper@fbb11db Add missing EntityDropItemEvent calls (#5674)
PaperMC/Paper@c879064 Call EntityDropItemEvent for goats dropping horns (#8094)
This commit is contained in:
BillyGalbreath
2022-07-04 15:39:33 -05:00
parent d1485fa5b6
commit ff0bea3098
40 changed files with 137 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0008-Ridables.patch
View File

@@ -22,7 +22,7 @@ index 153451ecd5b3c8e8ecb2d5ec91ccd582d4300899..56536c39bccfe097f8227c74a0d16799
super(x, y, z);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7b3b8c20b5c33804753e55324651f5fbe69e231e..ef30cc43c89594a1d42c1ca4b20b54893d9ce26c 100644
index 6e78441fb4089543947d0f7a3065a49d3e6373a5..455f1335c97193e35195f92a8884489a7be9d582 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1533,6 +1533,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -34,7 +34,7 @@ index 7b3b8c20b5c33804753e55324651f5fbe69e231e..ef30cc43c89594a1d42c1ca4b20b5489
this.profiler.push(() -> {
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 9bcea650735472d446df4663e49307855415e323..9fccf684d88014714b7468da41b937648e1a3e32 100644
index 4094d08d478a98cb4ff13ff3274ad0d88cd46e85..be388b21b256ba68e42b8f998722ef5dcc1edac3 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -218,6 +218,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -66,7 +66,7 @@ index 3ed1bd3f9a75056c040a3563533d53ad4438b962..2842ba7028bf833478758f2e839796b2
public void doTick() {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 147a8a0ff6593724f311b077579178c412480451..22fad6467c6b9202e8cbf3e77e90c50f73f1f640 100644
index 5574fdf7001d3bfc8ebef9af38039318125d0ba5..b639bb8582389c7f675fb9a7f60aebb9615b766e 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2662,6 +2662,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -79,10 +79,10 @@ index 147a8a0ff6593724f311b077579178c412480451..22fad6467c6b9202e8cbf3e77e90c50f
if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
ServerGamePacketListenerImpl.this.send(new ClientboundAddEntityPacket(entity));
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 5a50c83f288c2c4924f56ea42a4a5a9502c485a6..24568ee758ac75d9b38184f9e236fc3242850b45 100644
index 3a8f78ad1037b2bae3ab1ae40cbc25f4acafbc93..4733085d0782b80f9d74db7adc0929440cac3d47 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -361,7 +361,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -362,7 +362,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
private final Set<String> tags;
private final double[] pistonDeltas;
private long pistonDeltasGameTime;
@@ -91,7 +91,7 @@ index 5a50c83f288c2c4924f56ea42a4a5a9502c485a6..24568ee758ac75d9b38184f9e236fc32
private float eyeHeight;
public boolean isInPowderSnow;
public boolean wasInPowderSnow;
@@ -2761,6 +2761,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2770,6 +2770,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.passengers = ImmutableList.copyOf(list);
}
@@ -104,7 +104,7 @@ index 5a50c83f288c2c4924f56ea42a4a5a9502c485a6..24568ee758ac75d9b38184f9e236fc32
}
return true; // CraftBukkit
}
@@ -2801,6 +2807,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2810,6 +2816,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return false;
}
// Spigot end
@@ -119,7 +119,7 @@ index 5a50c83f288c2c4924f56ea42a4a5a9502c485a6..24568ee758ac75d9b38184f9e236fc32
if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
this.passengers = ImmutableList.of();
} else {
@@ -4517,4 +4531,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4525,4 +4539,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end
@@ -993,7 +993,7 @@ index 425c6da0de40983b0870c9fd1b53f16b6a11c34c..8f046fb76b6967e72abde523ffb790e0
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
index 7c53dddb598de85abf1eb8b8ee183a6e8e6f9c74..badaa1cb7919cc4699c5e732f9c84254416efdc3 100644
index 3f100d847fbce6db5b625e99c4f3694576237372..7343f6fa6c29d4029cc35e173e5d701efd7f57c6 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
@@ -78,14 +78,87 @@ public class Dolphin extends WaterAnimal {
@@ -1123,7 +1123,7 @@ index 7c53dddb598de85abf1eb8b8ee183a6e8e6f9c74..badaa1cb7919cc4699c5e732f9c84254
this.setAirSupply(this.getMaxAirSupply());
} else {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
index 8f294f10aca2df007830b12da0506f7614206a89..7bb7aaaff1e6e11db68b0f206bdf04fda0e88fc4 100644
index 6a66b5d1a3d8615dcc15057f03476e9ccbf4b4f2..6a1c2a43aa00a2e651ca19d2acfa54ae3f020c5f 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
@@ -140,6 +140,44 @@ public class Fox extends Animal {
@@ -2453,7 +2453,7 @@ index 3dd4e6d622a6daafa00ae971edd88a147e34beef..4dca3788a8fa335dc5969bd61cd0658f
protected PathNavigation createNavigation(Level world) {
return new WaterBoundPathNavigation(this, world);
diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
index f489301701f8abfb8f509d91089c1433db2346f8..ba47201f7b9ebfba28dc2f7ddc89375a8662476d 100644
index 362f952888f63a453a4352a9f1dc7df799244a3c..04eb870ac7db68f5854e0f52f2b3c988c9f35c6f 100644
--- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
@@ -89,6 +89,23 @@ public class Goat extends Animal {
@@ -5143,7 +5143,7 @@ index 4132c1113f5437a776e5e3c1cb306904775aed88..1a945a32c3d3705a318ebca72a365931
public void tick() {
super.tick();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 5b92c2ca03baed38f7d41a73fae7dd23ce541d43..3cc9dab362141fdf61bdcd542ffa5e5c11f99e24 100644
index 2a6c67634c31c332102d24bef293da1bacd0c000..158e1a61e9cc2661a09f6c4edb7db16464ca2e6d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1322,4 +1322,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {