Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
020f18aaa6 fix: promote slf4j-api to api scope (#6343)
c815948b6d Fix ITEM_DROPPED stat not working properly (#6331)
9a125eecb8 Fix Incorrectly Typed Goals (#6200)
23e3a0ccb6 Add PlayerSetSpawnEvent (#5690)
00028d57cf call EntityDamageByBlockEvent for campfires (#6244)
9b4a46f704 [ci skip] add vs code files to .gitignore (#5663)
a178fb895e Make hoppers respect inventory max stack size (#4838)
4a2f53c6e8 Add missing DamageCause for EntityDamageByBlockEvent (#6352)
f261419fd5 clone itemstack to return remaining stack (#6353)
This commit is contained in:
William Blake Galbreath
2021-08-07 19:10:45 -05:00
parent 661cc4bd82
commit b0f215162b
8 changed files with 23 additions and 23 deletions

View File

@@ -17,7 +17,7 @@ index 528fd87ae1c1c01e13885d88fc8056b0f932fb61..bfad241892b8280d261ab8301245b91b
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 5283d0d27da27f0946905f30ef7a8265175952fb..087c29cf45e45f769096a2a890befd959f49ca36 100644
index b2bf0ce295520e7dc6f17fd904769e47164675eb..023b3df9b375aa8f91a5f2e7d3592482afac7c0e 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 {
@@ -44,7 +44,7 @@ index 5283d0d27da27f0946905f30ef7a8265175952fb..087c29cf45e45f769096a2a890befd95
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2538,5 +2541,13 @@ public class ServerPlayer extends Player {
@@ -2559,5 +2562,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}