Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +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

16
patches/server/0009-Configurable-entity-base-attributes.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable entity base attributes
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index e2b2be41e9981196650096dd9d468618a96cb28e..5fa0b40eaa545d1047591f7166bb43e1872ffe34 100644
index 4733085d0782b80f9d74db7adc0929440cac3d47..1a6786565e5da5418423e9cb937a966a0755a0f9 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -155,7 +155,7 @@ import org.bukkit.plugin.PluginManager;
@@ -156,7 +156,7 @@ import org.bukkit.plugin.PluginManager;
// CraftBukkit end
public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -34,7 +34,7 @@ index 882ab40c8cdea8c214cb8344b3ccecddb2967c1c..cb79d2c958fbd34f8c8818e7e1c0db88
@Override
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 14444b86758912e9938026178ac3ba4e16e3b966..5a45e04f81171b3682cf39fcd3e35e440dec9090 100644
index 70846a6b4674bcb9bd95e933e32812c19e4a5a54..15ece7c31d5e960d7672aa95fb7e039ca3d69375 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -288,6 +288,7 @@ public abstract class LivingEntity extends Entity {
@@ -158,7 +158,7 @@ index 8f046fb76b6967e72abde523ffb790e0f46b80e0..dd4d5e2e7cbfed18cf3b4664dbe08eaf
@Override
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 badaa1cb7919cc4699c5e732f9c84254416efdc3..b3e53f922a424a407adb0111c29c8be6f89f8115 100644
index 7343f6fa6c29d4029cc35e173e5d701efd7f57c6..1ca3ffe212da2c3914c290172e729ba8017f631c 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
@@ -157,6 +157,11 @@ public class Dolphin extends WaterAnimal {
@@ -174,7 +174,7 @@ index badaa1cb7919cc4699c5e732f9c84254416efdc3..b3e53f922a424a407adb0111c29c8be6
@Nullable
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 7bb7aaaff1e6e11db68b0f206bdf04fda0e88fc4..8d25d79be606b173a59264706172561165f82143 100644
index 6a1c2a43aa00a2e651ca19d2acfa54ae3f020c5f..0d1e8ad0edcbe53d203b9fa6748f76f783afae5c 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
@@ -176,6 +176,11 @@ public class Fox extends Animal {
@@ -475,7 +475,7 @@ index 32b31e5efb5fc68430b9bcd4cd972494f53accc8..a80a7d460051a39fe805ae669b4586fb
@Override
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 ba47201f7b9ebfba28dc2f7ddc89375a8662476d..aa2abe00478b002fc90166441d8b89c7046ed022 100644
index 04eb870ac7db68f5854e0f52f2b3c988c9f35c6f..77be0c6f6e6061ceee1daa467c20c8d7ece7590e 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
@@ -104,6 +104,11 @@ public class Goat extends Animal {
@@ -719,7 +719,7 @@ index 0f8ce0c6ddbb37a61c6b15bb769b627bcd8105fa..6ed9e4e98c46b51cf398641ffb66abf3
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
index 079a85f1520cda6a0fb72d0dd7f9e18aec6a6c91..c1b67d5dc5fd533fb2aa28a5c7d9dd87cc7412d8 100644
index 0876034f2735af2b143112162b38a5bfd71139bb..7dcc1fd63294afa95b2f7115a72961ce175f01f2 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
@@ -160,6 +160,11 @@ public class EnderDragon extends Mob implements Enemy {
@@ -1338,7 +1338,7 @@ index be664e96a63bf6042375654e8297e4d6a54c7c8b..60d2abecb21c767fe290ffc9b7dd3446
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
index 42f6de4e9277d7208d5e0afb5a80d33f7f81ac46..e2e530aeba1311a0d89f1193ee0f6899e78ddfc0 100644
index 457de9aa4e049682f37421e3d83e7a7b09f66675..6d5251228128c38961fa6714b8569fa5e764c36d 100644
--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
@@ -93,6 +93,16 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {