Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37: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:
a4880d8 Fix NPE from using wrong ProtoChunk ctor (#6147)
55d5c16 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6149)
70ea1b2 Fix command signs (#6139)
This commit is contained in:
William Blake Galbreath
2021-07-11 18:49:40 -05:00
parent 162d05fa3c
commit 4addfd51ac
15 changed files with 110 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
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 081506649de3929becd448664e2c5b0d7b4859fc..a43c95abc8f6d0226ca097495ed9aeab0649d02b 100644
index e47673d410936068ceff8b757050cc6c8a15816c..1d6e063e1cf5435b123d5789d7fcf03503cc0821 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;
@@ -34,7 +34,7 @@ index 8f8bc29d847801938e251904b8334b4b31bd21c5..87d01bebbb179eec53323e9e23db011a
@Override
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 911a6f63e8ffeacc95fa49cdf99140c1ce3d06b1..ecc06c084625c24b9ac8045b1d53e75dfffbdea5 100644
index 28139fd78e7dfb703e941a46bd18e0236d58fe22..cecffa5879f386e99ccd27386f90074aef0b72fe 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 {
@@ -427,7 +427,7 @@ index 5f61fcffebf4d853711a38d1f315f3def25e31a7..fcd3166a7c818ef089ccf2a687596bef
public static String getPredefinedName(int variant) {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
index c86f13d190b41cb18dd833af39c7b4916068fd69..31568adcf4a89b11e61f455a15326c7f72bf487e 100644
index 631539a752a038926355c23aeb160af64f363a61..66c01b8300bc09ace27e4d1a30ee9274c69fcc9a 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
@@ -100,6 +100,11 @@ public class Turtle extends Animal {
@@ -735,7 +735,7 @@ index 5df112f87fba042f13f615a22a5c6f850b779bf7..d3caa18f5de2d96eae691655dd13e83f
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
index 9d879d85d6ca7d1163b05f15bb13baeeb59eea5b..2f33897a74ff2bd629b4ffacc4a1e1e0cd6b7987 100644
index fdc9068de403e98e18af11d4d6c5b708d2cc3c52..f52420f27f51d9dbf214f96a0530c0f17f2bc5fc 100644
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
@@ -196,6 +196,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -1083,10 +1083,10 @@ 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 55c09358766b2e7e871d9922b42e6e6b4157dab6..a36c78054cb70d310d9bb21c849e05b588aca8de 100644
index 1451aeab8e9046f9620214ed74369a8bb1cd6d59..864bb800499c6b1b47b4e556350615cfab7253dd 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
@@ -33,6 +33,11 @@ public class Skeleton extends AbstractSkeleton {
@@ -35,6 +35,11 @@ public class Skeleton extends AbstractSkeleton {
public boolean rideableUnderWater() {
return level.purpurConfig.skeletonRidableInWater;
}
@@ -1143,7 +1143,7 @@ index 25ce1910a03947ce070b318f57379f0da5ac5db8..7a9654a365a968592d706a13fb46615e
this.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue((double) j);
if (heal) {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
index 49e91abc7b78f88125f558f869f7619d36efdd04..653486b09c67988a0047e5e19647919bc503acc8 100644
index 5874d86ca34200e9ce7d41cf7a80eb0f1f13410c..7ed31ccc9fbb3960f9de24d5893f7fa1f86ab4b8 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
@@ -61,6 +61,11 @@ public class Spider extends Monster {
@@ -1239,7 +1239,7 @@ index e70fb661c62add74cdbe9fc9ef1e3143e96333b2..0876224d15b7b08954ab4348f942d2aa
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
index dd32e62de68243cf40f6df882922fd71bd1f4d67..8212ee2cc1242c0a3626f3643c455f3be0de18c2 100644
index 4cea4ba127dc036ce5d585323a25bbcf06bd46a6..16d7266c32f5aa5cb980bf07d9d92c41c6405a2f 100644
--- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
+++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
@@ -44,6 +44,11 @@ public class WitherSkeleton extends AbstractSkeleton {
@@ -1390,7 +1390,7 @@ index d01a8fe6dd5c84ea5b7370a90c0d57130b27e447..9e66f8f2a92cb7b32cdb2cf749ca2737
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 32ae046d573d5625fdb44b690d1e7e229f8aff08..b7b25813aa00a49fd83edfbade27fa03d7fcd7c5 100644
index f0f1f16971e9a0678afdccf6dcd92d8967c35346..1b70179dfd085c0d8ec3ee18af6d0528673ca4df 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -170,6 +170,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler