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

merge upstream

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-09 07:12:26 -04:00
parent 9ab5b07c78
commit 4b168c7792
41 changed files with 253 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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 e657ba0638bf17353289586ca7303b59c1bc62b1..fc5d69d2dc6470d4d7d0e8af2b96893f21eb3254 100644
index 79c4da6fb1cad621454b08e64f5da79678d21dc5..3a665115eb3da35fa7f5bd1b01b15c5536581220 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -261,6 +261,7 @@ public class ServerPlayer extends Player {
@@ -82,7 +82,7 @@ index e657ba0638bf17353289586ca7303b59c1bc62b1..fc5d69d2dc6470d4d7d0e8af2b96893f
public Scoreboard getScoreboard() {
return this.getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 90b6b10ddba0224b8bc7e5f0f70edea809670e3c..efc2204bd712449a93e132a19d31ae99b702972d 100644
index 602979d0d85cff155d50780ce2471de0806ae63a..d9005d3bd9f78fca0f5d7b8b64c74c6af0f8fd68 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2001,12 +2001,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -108,7 +108,7 @@ index 90b6b10ddba0224b8bc7e5f0f70edea809670e3c..efc2204bd712449a93e132a19d31ae99
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 ae3a7cc79897b2a247d63d1428d1a97e586d64ca..d7e65c889167de315206ae2a36f305c6255950a1 100644
index 02415cd2baf066b556886f63ae7e3f7fc60968e4..b031b358a2f87891e383f3bdfb5243a174ead8d2 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1007,6 +1007,8 @@ public abstract class PlayerList {
@@ -121,10 +121,10 @@ index ae3a7cc79897b2a247d63d1428d1a97e586d64ca..d7e65c889167de315206ae2a36f305c6
return entityplayer1;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f35f60b6fe470d9bc239ce9017f3a82ed984d342..69db9fb3b319b7f43d93375e719ec13c67388dff 100644
index d523a517ff0f4c8f0efaa38e64ecafef1ba6dc4d..eb37881e39004dea82a5b5e8e9832c361561d9c0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2794,5 +2794,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2780,5 +2780,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}