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 appears to apply and compile correctly

Paper Changes:
56d88119 Updated Upstream (Bukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-11-03 03:23:47 -06:00
parent 5569d022ff
commit bae5baad08
8 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -4764,7 +4764,7 @@ index 6c399bcea0..087bbad025 100644
}
// Paper end - optimised tracker
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 7abf55f532..10f3c97180 100644
index 17f093213f..490626ecd3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -415,7 +415,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -7363,10 +7363,10 @@ index 9118f05424..a9c96d45c6 100644
//Thread.sleep(TimeUnit.SECONDS.toMillis(20));
// Paper End
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index f7d751348c..f4d48753a7 100644
index 4ec0e9220d..1fe253bc72 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -502,27 +502,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -503,27 +503,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
entity.setHeadRotation(yaw);
}
@@ -7395,7 +7395,7 @@ index f7d751348c..f4d48753a7 100644
@Override
public boolean teleport(Location location) {
@@ -556,6 +536,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -557,6 +537,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return true;
}