Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +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@d714682 Add more entity api (#7564)
PaperMC/Paper@1790528 More projectile API (#5731)
PaperMC/Paper@ea1efef Remove Patches (#7541)
This commit is contained in:
BillyGalbreath
2022-03-11 15:53:15 -06:00
parent f9756e3b9c
commit 67f934ef19
11 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0132-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -18,7 +18,7 @@ index e39d333c10d74be81da173622b5e033bfde9cf3a..dace52b3cae2ce20c10080612bf6d6b0
BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index eacba5f8e426076b4b438b9ebc5bb8c937a786fa..a7cb8255cfda572ba77d3350703c03c08d4eaf42 100644
index 23e6a4f6a510cfcb80678446d7b371a23c5de6a3..baf011a492e9c4ccb42c769c74181da804046622 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -658,7 +658,7 @@ public abstract class Mob extends LivingEntity {
@@ -166,7 +166,7 @@ index a8698975b368b27c0bb1cab4e0b83d69e773fc6b..87aaad12386b0ad79b1017100c83ca04
j = Mth.floor(this.getX());
int i1 = Mth.floor(this.getZ());
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 0d6bc9dddca21b19835af06f6fd5d4e91f247c6f..a042155bd2075d861343760a5c61ab53795d29af 100644
index f486b722ef0c82b449238effc045fa9f68860193..f4aeaeef7d781a655e765993fb38a9d920c47109 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
@@ -349,7 +349,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -179,10 +179,10 @@ index 0d6bc9dddca21b19835af06f6fd5d4e91f247c6f..a042155bd2075d861343760a5c61ab53
// CraftBukkit start
diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
index 086d98da914ca958f91ce1a1d7aea7af9e0e5a03..48fc2c978ffadbc3a3728adc60c35cc743d5b024 100644
index 018d94c3540bf6241d57fe915b5037978601dc2d..28e293dd683b052782bb05d4523e908a6f4aa990 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -511,7 +511,7 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -521,7 +521,7 @@ public class EnderMan extends Monster implements NeutralMob {
@Override
public boolean canUse() {
if (!enderman.level.purpurConfig.endermanAllowGriefing) return false; // Purpur
@@ -191,7 +191,7 @@ index 086d98da914ca958f91ce1a1d7aea7af9e0e5a03..48fc2c978ffadbc3a3728adc60c35cc7
}
@Override
@@ -559,7 +559,7 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -569,7 +569,7 @@ public class EnderMan extends Monster implements NeutralMob {
@Override
public boolean canUse() {
if (!enderman.level.purpurConfig.endermanAllowGriefing) return false; // Purpur
@@ -290,7 +290,7 @@ index e69213b43c8aa5a7c04add7a87482d531fbf52d2..f51ea103238b4a50439f5162a248cd9a
// CraftBukkit start - fire ExplosionPrimeEvent
ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
index 97609bedb82dee6a200ff8b825622c427d7dcf73..39422e7fb1e04c007ec136ea709af22a558ff066 100644
index 73d18318afff5eac5966ddaeadf014524d06ec66..90f6a355e345f409ad7702ddc2b6c81ef4e7b933 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
@@ -320,6 +320,6 @@ public abstract class Projectile extends Entity {