Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

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

Paper Changes:
PaperMC/Paper@2fa8efc Updated Upstream (Bukkit/CraftBukkit) (#9485)
PaperMC/Paper@508a295 Only erase allay memory on non-item targets (#9570)
PaperMC/Paper@31358d5 API for updating recipes on clients (#6463)
PaperMC/Paper@8fe8ca6 Add clickable version on version command (#9347)
PaperMC/Paper@d6d2b6f Only capture actual tree growth (#6464)
This commit is contained in:
granny
2023-08-05 20:40:50 -07:00
parent 22eb20c622
commit 0e36fd08b8
48 changed files with 175 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0018-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 871c1c92cbabc6ecb432b5d1da441e02e08cd35a..1d205ddc1c880f18534ccfd3699060a885ed9fd8 100644
index 8276eff5d8085fe4c4f212d0afc5a36d02b84035..3274977a1d7442626329cfd31c720af13ec00866 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -278,6 +278,7 @@ public class ServerPlayer extends Player {
@@ -82,10 +82,10 @@ index 871c1c92cbabc6ecb432b5d1da441e02e08cd35a..1d205ddc1c880f18534ccfd3699060a8
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 55d2634ed7835cd78828bc6c4547fdcf0136fc40..5c57cb0ae56c9d180354580118f90c68b519d891 100644
index 552944305a98cc8c091bab535c2b5cece9953898..0ba3fbcf0004ef8eaf535b30b4a6931342ae2d09 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2094,12 +2094,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2096,12 +2096,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override
public void handleResourcePackResponse(ServerboundResourcePackPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
@@ -108,7 +108,7 @@ index 55d2634ed7835cd78828bc6c4547fdcf0136fc40..5c57cb0ae56c9d180354580118f90c68
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 0510d7e8b6f115292b493a036cc30c364ccf7397..8420afe3c04bf23c23038d638b4e9195134846f7 100644
index 1abb122a33eaf55de752d3d91bca8c1ee888dfd4..1897c0e8922aa654f03267cb8ad1a06a55efa98a 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -977,6 +977,8 @@ public abstract class PlayerList {
@@ -121,10 +121,10 @@ index 0510d7e8b6f115292b493a036cc30c364ccf7397..8420afe3c04bf23c23038d638b4e9195
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 71ec32a473e6bde53c3987ccf1bb1517771b181c..249ab7ef332c87a3fcac6e7cc4402ddaa1f4d50c 100644
index 673ac3704eee0b2aa576fe197abb8af5d8986e7e..19e970bea9424deb69120b382190d194bb20a130 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3206,5 +3206,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3238,5 +3238,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}