Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00: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@4d20922 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11024)
PaperMC/Paper@2fa5e0e Fix horse inventories (#11028)
PaperMC/Paper@62ed302 Fix entity distance check when applying knockback

closes #1553
This commit is contained in:
granny
2024-07-07 17:53:09 -07:00
parent de2e7a7967
commit cb0f04bd77
59 changed files with 260 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0007-Configurable-entity-base-attributes.patch
View File

@@ -34,7 +34,7 @@ index aa76a24421cdb3908a3544d92eb3d1e3c2ebedc4..8211c152e6f4232e82e452b08047e457
protected ParticleOptions getInkParticle() {
return ParticleTypes.GLOW_SQUID_INK;
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 1da16005b98be1fc01f277407579516df591e50e..930b3d5e75fd1c1ec717904070b58e66b737c246 100644
index d42e07a1317248784f5358626bc7ef5649ff0abe..d6adbad99a6d5b94ce0c62bb2438332a0eaffa80 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -314,6 +314,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -463,10 +463,10 @@ index 7357680b4fdf9250e086ba01531ade2bad7eb07b..60736df3b726c6a408c8b6aae6f0bd3e
this.entityData.set(Turtle.HOME_POS, pos.immutable()); // Paper - called with mutablepos...
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
index 1ae38914582cfb17da882304c8bcba84a7793f79..3268f07668eaa0322aeb77a158dfb2996d16dfcb 100644
index a643c9043c9685c01ff858bc6002686fa527bbfa..133aa48278ca51c74b5eb8900202e7076119e445 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
@@ -148,6 +148,12 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
@@ -149,6 +149,12 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
}
// Purpur end
@@ -497,10 +497,10 @@ index 49dccfc0010b5727250f7e27591502408c903739..902882ca639eee6efe102ea70e182fb1
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
index 6af72246e7f9bb845a497ef0f3394e634996fd40..196de6ac2ba44478f6a2239eb2657957806d7ccc 100644
index 8fcaf6860ad3c21ea13649219b91a1eb3490242b..3cc0d4f7a8483fc5133ff3a3e42e0bb0f01bca3c 100644
--- a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+++ b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
@@ -93,6 +93,12 @@ public class Armadillo extends Animal {
@@ -97,6 +97,12 @@ public class Armadillo extends Animal {
public boolean isControllable() {
return level().purpurConfig.armadilloControllable;
}
@@ -531,10 +531,10 @@ index 384fb16dac5eede49d89ad9fdcddcec442f0e7ca..0cf2dbc7d4ce89bddc8f23095272532c
public Map<String, Vector3f> getModelRotationValues() {
return this.modelRotationValues;
diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
index 32c10771db71c1cd190769614edd1c24762d32c6..e0c981cef6992c4a83813c6f77fe11841fe11c1c 100644
index 8fd7e6308b99328dce559d9140cbe182e3121801..f71560b8183672640f00e00479e89237ac96558d 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
@@ -316,6 +316,23 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
@@ -319,6 +319,23 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
return this.dashCooldown;
}
@@ -883,10 +883,10 @@ index d4aac30f9c9b356cec9fc1450a9e684faf030391..089edbcc1c92783e61e56beb32c47102
protected void registerGoals() {
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
diff --git a/src/main/java/net/minecraft/world/entity/monster/Bogged.java b/src/main/java/net/minecraft/world/entity/monster/Bogged.java
index 3fc3ab534b00f26cf2f1a79c20909f25021164a1..1dae6f96fe4dcac6d251639c6226a1d15b5ae691 100644
index a378635f3310b85b38badf8258b20aa3e12a8da0..71efea7a6bfb5662890dae5faae27a3c80afad2b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Bogged.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Bogged.java
@@ -60,6 +60,12 @@ public class Bogged extends AbstractSkeleton implements Shearable {
@@ -63,6 +63,12 @@ public class Bogged extends AbstractSkeleton implements Shearable {
public boolean isControllable() {
return level().purpurConfig.boggedControllable;
}
@@ -917,7 +917,7 @@ index 504996c8309fcd11de1dd166dee12d7e7db8db56..00c48623e8d53e4a00b9c3e40f6fd2c5
public boolean doHurtTarget(Entity target) {
if (super.doHurtTarget(target)) {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
index bc9db0ebd4280fe4dcb43bc47d5b7fc1f831394b..2e14fb23e36a335bbff0b54cf63c5c096869ad25 100644
index 14409ad5a039646e054345abe06d8d510e81f9ff..e702ba0adfe6b6ace68a9f94f6110fe0d4d0258b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
@@ -252,6 +252,12 @@ public class Creeper extends Monster implements PowerableMob {