Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47:43 +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:
5b20df6bf added PlayerNameEntityEvent
ff9c82444 Add worldborder events
616b1f3cd consider enchants for destroy speed
aaef1d5cc fix file conversion
674d8f7f7 Make discovered maps config work in treasure maps from loot tables too
be1687914 stop firing pressure plate EntityInteractEvent for ignored entities (fixes #4962)
7d56f38ed Do not use the bukkit singleton for the GUI (Fixes #5301)
4c9bdf53a Updated Upstream (Bukkit/CraftBukkit/Spigot) (#5299)
8647bd130 Improve ServerGUI
fcc6d3359 Throw proper exception on empty JsonList file
17d2e1291 Fix interact event in adventure mode
964e0bf42 MC-29274: Fix Wither hostility towards players
9e24a5213 Fixed furnace cook-speed multiplier losing precision when calculating cook time
c7e42faa3 Do not create unnecessary copies of the passenger list
40881ad67 added tnt minecarts to the tnt height nerf
26be708f4 Remove streams from SensorNearest
5b5989b21 fix nullability of playerlist header/footer, closes #5290
45bc531dd Fix Material#getTranslationKey for Block Materials (#5294)
This commit is contained in:
BillyGalbreath
2021-03-04 21:45:44 -06:00
parent 68ff99ea92
commit d93887a156
60 changed files with 169 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0158-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -146,7 +146,7 @@ index d12de20cf4bb2345c616d3cc0b9f50bddb5135ee..3f3be1b2ded6ad118ae7860c1231c7af
// CraftBukkit start - fire ExplosionPrimeEvent
ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 0aebf35a5b631417d32572cd90bf59b5568ade60..330f27f649a2ab1567ebc1b547f1f2a5ce645055 100644
index 79fde7b4763642dc4941899ab186db9dfab3b574..38f94d4983b69e265441a2b8365702df57a881f5 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1473,7 +1473,7 @@ public abstract class EntityLiving extends Entity {
@@ -185,7 +185,7 @@ index ad2a2c27f0ef064064ded28cc049a6856d476808..e07f224289a937689a26d58639899abb
if (this.b.fb() && !this.b.fa().a() && this.b.eN() && !ItemStack.matches(this.b.getEquipment(EnumItemSlot.HEAD), Raid.s())) {
diff --git a/src/main/java/net/minecraft/server/EntityRavager.java b/src/main/java/net/minecraft/server/EntityRavager.java
index 9e21603cb1681cc702084fdeebb6f93754d87bc8..f9df1389189962ce08e50647baffd9eecb00968a 100644
index 820938c76e787fac6c65eb000491232d5b749dee..3606440e41ab3193fadebb455c0967dbc0ccbb63 100644
--- a/src/main/java/net/minecraft/server/EntityRavager.java
+++ b/src/main/java/net/minecraft/server/EntityRavager.java
@@ -137,7 +137,7 @@ public class EntityRavager extends EntityRaider {
@@ -246,10 +246,10 @@ index fa0c459dcd773e003a2852c594ec7254e4eb11b8..88eeabeb89fe733c462a667d7564da3b
}
diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
index 6236627b29c5d4c9d2ea67bb3c3926cdb1e0b5ec..014de51f9b803cda27e735d30cde5c869947a31b 100644
index cc4b0945fb9186c6975136d48ce8dfc12b4d4230..0b6cb7c3c55f4b0951fde643a898bd67a08e08af 100644
--- a/src/main/java/net/minecraft/server/EntityWither.java
+++ b/src/main/java/net/minecraft/server/EntityWither.java
@@ -322,7 +322,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -323,7 +323,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
if (this.getInvul() > 0) {
i = this.getInvul() - 1;
if (i <= 0) {
@@ -258,7 +258,7 @@ index 6236627b29c5d4c9d2ea67bb3c3926cdb1e0b5ec..014de51f9b803cda27e735d30cde5c86
// CraftBukkit start
// this.world.createExplosion(this, this.locX(), this.getHeadY(), this.locZ(), 7.0F, false, explosion_effect);
ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), 7.0F, false);
@@ -434,7 +434,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -435,7 +435,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
if (this.bw > 0) {
--this.bw;