Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27: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:
PaperMC/Paper@397349e Adventure 4.9.1 (#6634)
PaperMC/Paper@d0a2193 Fix interaction pos in range check (#6654)
PaperMC/Paper@6de48db Fix player death kept items not being in same slot (#6663)
PaperMC/Paper@3e3cea1 Ensure valid vehicle status (#6673)
This commit is contained in:
granny
2021-09-28 18:57:18 -07:00
parent acb8a26d9a
commit fd158ac23a
24 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0148-Add-EntityTeleportHinderedEvent.patch
View File

@@ -98,10 +98,10 @@ index c9fb98c7aacf0745ee5f008629ebfe2d117f664d..58812794be7c3676fa527cdeb8e48e24
noteBlockIgnoreAbove = getBoolean("gameplay-mechanics.note-block-ignore-above", noteBlockIgnoreAbove);
persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 7c51a6113bbf35f96693daf2988b6d59e53cbca1..9430d4e270cd5ebabeffde0e28f0a96657ce0262 100644
index f8811514c155f743f6e93c9a88721903fdb1bddd..501f9310bdc13b6d38dcdda4ad7fdfd19216d6e6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -561,6 +561,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -562,6 +562,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
location.checkFinite();
if (this.entity.isVehicle() || this.entity.isRemoved()) {
@@ -113,7 +113,7 @@ index 7c51a6113bbf35f96693daf2988b6d59e53cbca1..9430d4e270cd5ebabeffde0e28f0a966
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f9d00b4bd00f8e0a7680a99e94d09fe2f311cbac..86cc5b5ef6bb8bfeaf9ee4436790f8f8e3faf018 100644
index acca95dbf81a5c8fcffc496431dd65579d323701..2aab21f43e3c5564d1970be7a98a08e2a68d10a8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1009,6 +1009,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {