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:
a7cddc4 Hotfix for some of the reobf issues tracked in Paperweight issue 24 (#5965)
b1f6e26 Fix mobs not burning from summon command (#5961)
4e2f0be Refactor Anti-Xray and make some fixes to it (#5938)
d50cc01 Make gradle take build number from env vars and add git build info (#5890)
This commit is contained in:
William Blake Galbreath
2021-06-23 16:46:21 -05:00
parent 0babd7cad8
commit 921a000994
13 changed files with 56 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0003-Ridables.patch
View File

@@ -34,7 +34,7 @@ index 4690a1c926dd695c98ac8012f271e1a71a0d3d6d..4aee3582f54a91191860108450a0a0dc
this.profiler.push(() -> {
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 14bea212adbfa341ca6080a01f87b51891808d2a..56ec19abc2fa4b63eb93e1ca54c3b3c4c36ba88c 100644
index 87b3eee23441717660aa6bb81248986cb7ef2fb4..76f72a8fe151cb9f4c5be38ec8f68790a3b9bfef 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -201,6 +201,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -2687,7 +2687,7 @@ index 1c8f6863b976cfcb559de9b3e3cf9292831166ee..68c5609845617bf5aeb82ea4e3a88bdc
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
index c54a37516ef1d8a76f7161917bf448127cd98603..af1a3c67c9e094fd5cc5d84600cc670aea055f69 100644
index cd75f895b6818fbb7ed4b0ef3df873f264bb2d1b..74f4f8e1c9faef3b50fa817ca3dfbb6b19b1622d 100644
--- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
+++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
@@ -69,12 +69,14 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
@@ -3418,7 +3418,7 @@ index 130205f0d101debaa74c1172fb80863e6fa0ebe1..7d39f25734f2c52b11931e141524acd2
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
index 67f2d2f45138578646920ccae5b455a842a7b9e8..60bfeb0e5a667899a02fb59c13d637d87416e483 100644
index 39291a0cea465613733a905141b584f05e597b4c..61aff98a7b56eab6a43ddc9f07618cbbedb6b77d 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
@@ -61,6 +61,59 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -3502,7 +3502,7 @@ index 67f2d2f45138578646920ccae5b455a842a7b9e8..60bfeb0e5a667899a02fb59c13d637d8
this.setSecondsOnFire(8);
}
@@ -263,7 +318,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -265,7 +320,7 @@ public class Phantom extends FlyingMob implements Enemy {
private AttackPhase() {}
}
@@ -3511,7 +3511,7 @@ index 67f2d2f45138578646920ccae5b455a842a7b9e8..60bfeb0e5a667899a02fb59c13d637d8
private float speed = 0.1F;
@@ -271,8 +326,19 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -273,8 +328,19 @@ public class Phantom extends FlyingMob implements Enemy {
super(entity);
}
@@ -3532,7 +3532,7 @@ index 67f2d2f45138578646920ccae5b455a842a7b9e8..60bfeb0e5a667899a02fb59c13d637d8
if (Phantom.this.horizontalCollision) {
Phantom.this.setYRot(Phantom.this.getYRot() + 180.0F);
this.speed = 0.1F;
@@ -318,14 +384,20 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -320,14 +386,20 @@ public class Phantom extends FlyingMob implements Enemy {
}
}
@@ -4517,7 +4517,7 @@ index 69f439851fe1ff07d827eaed274940a5783d5f6c..07853aff3d42ce50799406ee1c14389b
Projectile(EntityType<? extends Projectile> type, Level world) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 74fc4fc2216cf82e1546ef3d567f2750b1240df1..c90dda3d62dab896f68481000c0b6db1426bc461 100644
index 7c5ecdbd5a05ae07a440cadf79d59a439e4db524..bd0807e5647ad4745fa585bf7e6c853239cdd271 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -127,4 +127,9 @@ public class PurpurConfig {