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:
2780e94 Fix PaperTickList (#6241)
b854e7e Drop unneeded patch (#6240)
2961b2a Fix various mob drops being captured as death drops (#5675)
3801a39 Add ItemRarity test (#6247)
170382f Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6245)
This commit is contained in:
William Blake Galbreath
2021-07-23 10:55:13 -05:00
parent 0dad40ac19
commit dd259870b0
24 changed files with 172 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0006-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 e47673d410936068ceff8b757050cc6c8a15816c..1d6e063e1cf5435b123d5789d7fcf03503cc0821 100644
index 08efd9b12786077e4f6ae1bfffb912d317f4f418..9b6ee1fc3fd17faf2c2be56c0c292b1d5f98e0fa 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -150,7 +150,7 @@ import org.bukkit.plugin.PluginManager;
@@ -110,7 +110,7 @@ index 14822b20971b63290a7022f8efe65693c41664d2..1cbbc29ef19c8f1b8f96882213b662cf
public ResourceLocation getResourceLocation() {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
index 771e55cceaf17167c00554b1be7043a4cb3efb7e..55dccf338f9fba17fbcb88672d36b83e7bbec88b 100644
index 7a5119e007d69adc9a77fbd167a8d19a9c71c6ff..9fe68301b9a6efd703fb9d2215a9cd3b2f017a4e 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
@@ -62,6 +62,11 @@ public class Chicken extends Animal {
@@ -238,7 +238,7 @@ index 2a8f6d920370b4087895e9f0098a0f41d9b1e152..de0247899f0bf785a94e39e170c8e2fc
public boolean isTrusting() {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
index 4591b67537aa95ce0a7e6ad838b7db9da80346cc..13ef0071b98ad2b7654914b62711a661f14b2c42 100644
index fa9dbb22dd13c650ef08af6030d60c5fc8ee8044..d0c10a6d465e2ac9a1bec04080a23dfb081e9f3e 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
@@ -127,6 +127,12 @@ public class Panda extends Animal {
@@ -254,7 +254,7 @@ index 4591b67537aa95ce0a7e6ad838b7db9da80346cc..13ef0071b98ad2b7654914b62711a661
// Purpur end
@Override
@@ -615,7 +621,10 @@ public class Panda extends Animal {
@@ -617,7 +623,10 @@ public class Panda extends Animal {
public void setAttributes() {
if (this.isWeak()) {
@@ -379,7 +379,7 @@ index 5890bf8aa714dc219059bca4950a1b5b1882dd3a..497be3182c72b5a0f3bc42088c416870
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
index a76f3c1c409dc96f7033be8a7eeb06617053735b..7fbe1a62e9c67a8bdaf13aaa9fae1d8742d75148 100644
index 229b3cc63d2ec0bc5e5797d45efd9ca45f3ea82a..fcf3092ef1863f62d9e76a77c0299ce1495ca1b7 100644
--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
@@ -63,6 +63,11 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -459,7 +459,7 @@ index bca3300e06d6eb0c6acdfb11d715a1e8447c9198..ae416b70109c959980b3115da6e97df1
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
index 06c831f1a4b5159afadecff4a25248397ecbd2c7..cdc8e548ea48efd481ad6495cab6d8e9f77cfb15 100644
index 0c2dbff44ec7238c051850976a5f1fd565f35258..6986a6f1a862617505a00923c5aa3cd798d4e9da 100644
--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
@@ -105,6 +105,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
@@ -927,10 +927,10 @@ index d95b110a025d48e7ab18f172e455593740e45252..c67f33f2e2e0ff5c2a85782185103325
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Guardian.java b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
index 4aaad673f49988be6470b817d42f3fc4e6936400..8df1db3bee586d0faa3f58076ace2d8b937e85af 100644
index 20b7104b7fd38b3c6c05a68a1472c6006814cb81..2a25dbf9449ebc63587f24346ee92bd3115ad4d6 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Guardian.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
@@ -85,6 +85,11 @@ public class Guardian extends Monster {
@@ -87,6 +87,11 @@ public class Guardian extends Monster {
public boolean rideableUnderWater() {
return true;
}
@@ -1083,7 +1083,7 @@ index e66cc79dc61721b31ffb743f68f4388cc499a92d..0d60d6352294fadc1a26579a712b01cf
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
index 1451aeab8e9046f9620214ed74369a8bb1cd6d59..864bb800499c6b1b47b4e556350615cfab7253dd 100644
index 059a62da29b7ec11e2ff9baf18dde788bec4923c..5a2759e636717920a6b34ddbda34a1106a88714b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
@@ -35,6 +35,11 @@ public class Skeleton extends AbstractSkeleton {
@@ -1271,7 +1271,7 @@ index 8fd4e26ebe0527fd8a69b15095dd4091fcdde206..7afc9b83e385d711096db5ea9c6c259f
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index abcdfc77ccef27db11a9e0fe8cb29f84f5e82391..3b7e261eae87445387f5a34d6fbb420c4cd0cf0f 100644
index 6dee348b4e1faec208e5144527ca3df0dab4f96e..c3288e6a5be2c0805067fe14496315afd6156110 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -117,6 +117,11 @@ public class Zombie extends Monster {
@@ -1296,7 +1296,7 @@ index abcdfc77ccef27db11a9e0fe8cb29f84f5e82391..3b7e261eae87445387f5a34d6fbb420c
@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 5744d181b91bcf7f8202c801bce42c96acbdb524..ce15ebc6248eaa849ccb1de4319b51e8a12f2e3e 100644
index d487b4cb2da18eac12ec3dc71997cdc1217a85f6..9c60e3b3e62a29d6898c82a4110ffd4d1c7cb5f2 100644
--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
@@ -84,6 +84,16 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
@@ -1358,7 +1358,7 @@ index ce7f7caa535aab1bf849b7e28c98c177e16d1ea3..5d289be8f0ef003abbce992e7662f6dd
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
index 34d7bb4daab7ddd857112741d7a0d077d8cec24e..4d00d99fb4d3e6a87a9f19470d5a7672dd068eb3 100644
index 588209ab0a8263951bba9f0b7f46f18b8f7cd9e2..073736808188218429c2612c06d7af82e81d0f83 100644
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
@@ -107,6 +107,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento