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

upstream

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-09 20:03:02 -04:00
parent 102b3130fe
commit 4f291c3b98
30 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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 79c4da6fb1cad621454b08e64f5da79678d21dc5..3a665115eb3da35fa7f5bd1b01b15c5536581220 100644
index e40e8e837273c243f5ccc192514d540440f49310..64183c02cf278b20ed59120fa20fc7265321fc40 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 {
@@ -108,7 +108,7 @@ index b67bd2d606e44804f51478847e01da18f0d64349..194c352c1d038ca9726aecfd944b38d5
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 02415cd2baf066b556886f63ae7e3f7fc60968e4..b031b358a2f87891e383f3bdfb5243a174ead8d2 100644
index 1e4be9af14b305aed38a7a3cf38a4659ba3aeb18..407bcae5459cbc6c670f7f44dd8bb593935ffffa 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 02415cd2baf066b556886f63ae7e3f7fc60968e4..b031b358a2f87891e383f3bdfb5243a1
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 d523a517ff0f4c8f0efaa38e64ecafef1ba6dc4d..eb37881e39004dea82a5b5e8e9832c361561d9c0 100644
index 16aa402f7b9ff8c2f1748bc4c82005ccf093ceb4..5cd36fef58afdc60d58acde8809f6507d4d1ea04 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2780,5 +2780,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2815,5 +2815,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}