Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47: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@52a60ad Updated Upstream (Bukkit/CraftBukkit) (#8172)
PaperMC/Paper@5deafd1 Teleportation API (#6562)
This commit is contained in:
BillyGalbreath
2022-07-22 16:44:39 -05:00
parent 028780d4e1
commit 9a15789561
27 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ 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 4733085d0782b80f9d74db7adc0929440cac3d47..1a6786565e5da5418423e9cb937a966a0755a0f9 100644
index b294ebd7f7a327756f2925b8418d755d7db4aa0d..fd3df46348e217a73b3975d703a7381890569c71 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -156,7 +156,7 @@ import org.bukkit.plugin.PluginManager;
@@ -78,7 +78,7 @@ index 2edc11b093dbfc96d287dc9d3e208cc2a39c537e..007c945725721ddb8a3dc4b8085e8c68
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
index 1458079a5ffa8b4a50d30cfc01fa1b27b6a46f37..0fb1aa7bfbadc5e2df34391a4c9f0d045d576740 100644
index 15c8fcb3df7ae30fecdfc367904a6fe12a7143ad..6efcad6eb77390771ef360cb04de1efd06d85549 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
@@ -214,6 +214,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -808,7 +808,7 @@ index a5250d7a85f11c58732d7e3d3ca3321efac42fc0..0bf2355b7ac80227c06b3e85f1645559
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
index 869a2ee5e0775cc477fb56063dfa4ce4a0c6e3f2..4b58ca48deda0410edf9ad3c9079858d5a31a762 100644
index af1a6cd77e70141be8b6507e1494babaeab3828c..9e7ea6be928fb536c9898a85bb0a9ad40af25bd5 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
@@ -83,6 +83,16 @@ public class Drowned extends Zombie implements RangedAttackMob {
@@ -1067,7 +1067,7 @@ index e3e1743e4a8d6ddccdbd08351b3524e6e2bed38c..13c0c270dc56f0e3d6e60714a3b9abeb
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
index fe4f2690a562601ca64e4969beadc65516edc7b2..647e0fbd0ff54944fbe7e2a9a6ac40a32919359c 100644
index ad5fa8d9146262d569255994c7c7df80efacd5f1..6d1d682d193b630706731ba6d4a44955e8a0a2e7 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
@@ -90,6 +90,11 @@ public class Ravager extends Raider {
@@ -1265,10 +1265,10 @@ index c0421de54b2d192d67c54cef359f6b12d2d013c1..c3b8bce2d8e1dccb619267923964e06a
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
index 7775f1428a455f0d52f43ed07102cb242f6d23ad..0359db7ccca286df046066b4a2356a50b8240a56 100644
index f15b93f24adfa72d6d2271b67ecca0996df2d870..c4ee1bca68b26403b6671c8c5f7fc3f037ad1128 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
@@ -74,6 +74,11 @@ public class Witch extends Raider implements RangedAttackMob {
@@ -71,6 +71,11 @@ public class Witch extends Raider implements RangedAttackMob {
public boolean isControllable() {
return level.purpurConfig.witchControllable;
}
@@ -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 457de9aa4e049682f37421e3d83e7a7b09f66675..6d5251228128c38961fa6714b8569fa5e764c36d 100644
index 0838dc70da3a56730820ed0685d250f10296e377..efbcf6dd43fa9ce368978f568dcfd6887c3f9742 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 {