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

Add back Tuinity

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-24 17:26:08 -05:00
parent f790e54b7a
commit 0650816cca
68 changed files with 316 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 65e59e3bfc07e1ba6fadd7d83e0f5eb7a58fcf78..609afae1bfdbeb82fb48bdbb0200427a67f1cd2a 100644
index bfdb9e8f1a7e82f0022e050598fee4e51e1222c2..9149f496c163834bf0e9c40086ba3ee9d38177c2 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -333,6 +333,7 @@ public class ServerPlayer extends Player {
@@ -46,7 +46,7 @@ index 65e59e3bfc07e1ba6fadd7d83e0f5eb7a58fcf78..609afae1bfdbeb82fb48bdbb0200427a
return this;
}
}
@@ -2378,8 +2386,16 @@ public class ServerPlayer extends Player {
@@ -2390,8 +2398,16 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {
@@ -65,10 +65,10 @@ index 65e59e3bfc07e1ba6fadd7d83e0f5eb7a58fcf78..609afae1bfdbeb82fb48bdbb0200427a
@Override
public Scoreboard getScoreboard() {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 4473e5123568a35dd59b769a529f5670cf9bdc4a..4659247703679bd3c860ea5d685ae985daf799ce 100644
index af0c7bbce7641f5aa659abb440a6cd6f57019ede..71030d9e156ce28f1ef9e3ed6845f022a62dfdaf 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1860,6 +1860,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -1938,6 +1938,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
}
// Paper start
PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packet.action.ordinal()];
@@ -77,10 +77,10 @@ index 4473e5123568a35dd59b769a529f5670cf9bdc4a..4659247703679bd3c860ea5d685ae985
this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
// Paper end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index a6ecbb7eb1df7923d58366327e0f00512a3a1677..6857abb1b741794d7eda507f738178eb998039f0 100644
index d65ca67bb0d46ecd8a4003e44cfec71661679480..51ef325fab982c2fd8a7eb3d7e73cbfdf5b82734 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -990,6 +990,8 @@ public abstract class PlayerList {
@@ -991,6 +991,8 @@ public abstract class PlayerList {
}
// Paper end
@@ -110,10 +110,10 @@ index 0a9024e766ed12b321008b3b19ce92d2f5fdfcab..52d30f1ece8b48bba953b11013b7aa10
public boolean babiesAreRidable = true;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 38b7bc0399be51eec4c00e5ce1240d7468878aea..676d98f183d798f1ea894cd78539f9034edb3659 100644
index e2d28ea4d8bb0df1a394afe7a48683b443989552..22693f6c27b120c987153753dd33ffd37c227592 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2489,5 +2489,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2544,5 +2544,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}