Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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@2040c1e Player Flying Fall Damage API (#5357)
PaperMC/Paper@fa42c68 Expose pre-collision moving velocity to VehicleBlockCollisionEvent (#8457)
PaperMC/Paper@90750a6 Rework filtering spawn egg and tile entity nbt config (#6613)
This commit is contained in:
Encode42
2022-12-29 00:19:27 -05:00
parent f7dafcae34
commit dad13788ad
163 changed files with 117 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0018-Player-invulnerabilities.patch
View File

@@ -82,7 +82,7 @@ index e40144aad9182ccb2ed871d74378cf0af783c9f1..8e6c0ab117f7c79e51470a1364995217
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 a2a1e678d286d2d2b47b7df6318c4eef4bf64127..9f86bff926434b58143522d624ea7d6e044e430d 100644
index 60dd6eb68e500d72e1189322d51d1c1fd71fe881..e6d4bd13bb37329656e2d8931da186d384d3652f 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2091,12 +2091,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -108,7 +108,7 @@ index a2a1e678d286d2d2b47b7df6318c4eef4bf64127..9f86bff926434b58143522d624ea7d6e
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 7a5e3bf6e593ed15e8292eefe10f588cbad3d080..603d5bfd03d3dec44f627d1260dc40fc3e189f2a 100644
index e3a430827f40c00e60256c21e2fbee1b6c1eab5e..95ae7839d7b7596f0692abb6824a172f44710b23 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -947,6 +947,8 @@ public abstract class PlayerList {
@@ -121,10 +121,10 @@ index 7a5e3bf6e593ed15e8292eefe10f588cbad3d080..603d5bfd03d3dec44f627d1260dc40fc
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 09c88f1bb2d8c629350cb21b3801767295396ea0..f61a1326fa943b606de8f75a6b7f95b9e220047a 100644
index 56cf4ce045dcd9d52beee849165cad3673601b54..d2bb97c72c75a5d56e1d34294717aec959779196 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3029,5 +3029,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3042,5 +3042,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}