Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57: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:
63fe5e4b7 Fix further issues with rgb text pattern matching
89be8185d Don't grab the threads stacktrace when dumping same thread
ca4c781d8 [Auto] Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
jmp
2021-02-25 13:16:23 -08:00
parent d3c8fb27f3
commit 831b8d70df
16 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,10 +123,10 @@ index a3b810556e306bc2be65c7811cfa7806d5752cfa..f96c41fc8788ee7b674c18cc0fa692df
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d56b57dcef38dfe0246ea8614c24515b4c3356e7..f719624952d74fc5fa0ab4b5dd08bd0327f61d99 100644
index f3aee5675417b60f5e1cb3b4f7a0e91d126c6a86..64136bf20a04e46f922a82a184a91bfb7b1db95d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -115,6 +115,7 @@ import org.bukkit.entity.EntityType;
@@ -116,6 +116,7 @@ import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerRegisterChannelEvent;
import org.bukkit.event.player.PlayerTeleportEvent;
@@ -134,7 +134,7 @@ index d56b57dcef38dfe0246ea8614c24515b4c3356e7..f719624952d74fc5fa0ab4b5dd08bd03
import org.bukkit.event.player.PlayerUnregisterChannelEvent;
import org.bukkit.inventory.InventoryView.Property;
import org.bukkit.inventory.ItemStack;
@@ -860,6 +861,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -873,6 +874,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
if (entity.isVehicle()) {