Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18: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:
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

33
patches/server/0204-API-for-any-mob-to-burn-daylight.patch
View File

@@ -112,7 +112,7 @@ index d92549e81160afaa1d109501806f3af96c475d7e..c5fa64b2d1559bf47b3dac8a2a10205e
@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 af1a3c67c9e094fd5cc5d84600cc670aea055f69..64ea34d768fdcee86ab59c5a12f04ddc11b9d8f4 100644
index 74f4f8e1c9faef3b50fa817ca3dfbb6b19b1622d..9c74969267d14b5c41187ef4182f56020af9685a 100644
--- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
+++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
@@ -65,6 +65,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
@@ -161,15 +161,16 @@ index af1a3c67c9e094fd5cc5d84600cc670aea055f69..64ea34d768fdcee86ab59c5a12f04ddc
super.aiStep();
}
@@ -231,14 +211,14 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
public void readAdditionalSaveData(CompoundTag nbt) {
super.readAdditionalSaveData(nbt);
@@ -233,7 +213,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
this.reassessWeaponGoal();
- this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay"); // Paper
+ // this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay"); // Paper // Purpur - implemented in LivingEntity
// Paper start
if (nbt.contains("Paper.ShouldBurnInDay")) {
- this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
+ // this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay"); // Purpur - implemented in LivingEntity
}
// Paper end
}
// Paper start
@@ -242,7 +222,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
@Override
public void addAdditionalSaveData(CompoundTag nbt) {
super.addAdditionalSaveData(nbt);
@@ -200,7 +201,7 @@ index 6c89eabddda16f9b72e6062c31bb4be6beae442d..2ff43cebc2e6471395e90a8a19828d94
@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 a8d8b524cd8e532f78ee6e61a883bd0aa340a718..99ac69b9d65ba5320043cc24eba1c102d552210f 100644
index c39e2d05fa81279a684532ee796880b1345e8c1c..c44ca111cf8601256bbfb8b6fc95995677db9d1f 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,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -220,16 +221,16 @@ index a8d8b524cd8e532f78ee6e61a883bd0aa340a718..99ac69b9d65ba5320043cc24eba1c102
this.setSecondsOnFire(8);
}
@@ -263,7 +264,7 @@ public class Phantom extends FlyingMob implements Enemy {
if (nbt.hasUUID("Paper.SpawningEntity")) {
@@ -264,7 +265,7 @@ public class Phantom extends FlyingMob implements Enemy {
this.spawningEntity = nbt.getUUID("Paper.SpawningEntity");
}
- this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
+ // this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay"); // Purpur - implemented in LivingEntity
if (nbt.contains("Paper.ShouldBurnInDay")) {
- this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
+ // this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay"); // Purpur - implemented in LivingEntity
}
// Paper end
}
@@ -278,7 +279,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -280,7 +281,7 @@ public class Phantom extends FlyingMob implements Enemy {
if (this.spawningEntity != null) {
nbt.putUUID("Paper.SpawningEntity", this.spawningEntity);
}
@@ -238,7 +239,7 @@ index a8d8b524cd8e532f78ee6e61a883bd0aa340a718..99ac69b9d65ba5320043cc24eba1c102
// Paper end
}
@@ -339,7 +340,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -341,7 +342,7 @@ public class Phantom extends FlyingMob implements Enemy {
}
public void setSpawningEntity(java.util.UUID entity) { this.spawningEntity = entity; }