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 & Tuinity)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
fcbeac8a [CI-SKIP] Readme update (#3702)
824f8086 Bandaid italic legacy serialization #3757 (#3760)

Tuinity Changes:
9f21359: Re-add optimise collision checking in player move packet handling
1152054: Revert player move packet optimisation
ef0a6c4: Optimise collision checking in player move packets
This commit is contained in:
William Blake Galbreath
2020-07-02 20:37:57 -05:00
parent 140a58f451
commit 5c7cdad371
127 changed files with 178 additions and 1200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0025-Player-invulnerabilities.patch
View File

@@ -1,15 +1,8 @@
From 782c29bce0fea7efdaf48b9c1f23a6258a694fd2 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 2 May 2020 20:55:44 -0500
Subject: [PATCH] Player invulnerabilities
---
.../net/minecraft/server/EntityPlayer.java | 21 +++++++++++++++++--
.../minecraft/server/PlayerConnection.java | 1 +
.../java/net/minecraft/server/PlayerList.java | 2 ++
.../net/pl3x/purpur/PurpurWorldConfig.java | 7 +++++++
.../craftbukkit/entity/CraftPlayer.java | 15 +++++++++++++
5 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 508a91418..07f8f0fa7 100644
@@ -74,10 +67,10 @@ index 508a91418..07f8f0fa7 100644
public Scoreboard getScoreboard() {
return getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 6be2c0192..e08143623 100644
index aa6855c35..a7ace9034 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1575,6 +1575,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1576,6 +1576,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
// Paper start
PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];
@@ -139,6 +132,3 @@ index e8c8ba74b..14a5a4072 100644
+ }
// Purpur end
}
--
2.26.2