Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-20 10:18:16 +02: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:
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
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0006-Ridables.patch
View File

@@ -46,7 +46,7 @@ index f9ed48f5bbde84fd1804e482f2777b516cc3a1ef..29b841462037fa97f72971c490b617d1
return new Throwable(entity + " Added to world at " + new java.util.Date());
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 3802a1dc3997704031d22165f60f854f50bda9d6..871b006b99d3872bc8a5a238227a1624fc493eac 100644
index 660f7fbbdd88b8eb2b58aed03925ee63db924a7c..ce796a2cc083ffc5497cdb3bac9da87ea4ba94a7 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -665,6 +665,15 @@ public class ServerPlayer extends Player {
@@ -65,7 +65,7 @@ index 3802a1dc3997704031d22165f60f854f50bda9d6..871b006b99d3872bc8a5a238227a1624
}
public void doTick() {
@@ -2416,4 +2425,6 @@ public class ServerPlayer extends Player {
@@ -2437,4 +2446,6 @@ public class ServerPlayer extends Player {
return (CraftPlayer) super.getBukkitEntity();
}
// CraftBukkit end
@@ -5752,7 +5752,7 @@ index 8ce49478441e77cedf5148ecb81d78b32660329e..fb5cd6fe7903f3f96af1abb55832bafb
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index d01d4ca873f8225d3503ecb102ce2eb7bfced421..5338d1638988c6fdd855eb9acf4fb7f6d4eaa498 100644
index 622a0f23db838b839f76722df0e5480ec927b4a2..98e0c1e64d23552b8e8de5e17cee09fc0cb08d5c 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -537,6 +537,15 @@ public class CraftEventFactory {
@@ -5779,7 +5779,7 @@ index d01d4ca873f8225d3503ecb102ce2eb7bfced421..5338d1638988c6fdd855eb9acf4fb7f6
}
event.setCancelled(cancelled);
@@ -1042,6 +1052,7 @@ public class CraftEventFactory {
@@ -1046,6 +1056,7 @@ public class CraftEventFactory {
if (!event.isCancelled()) {
event.getEntity().setLastDamageCause(event);
}
@@ -5787,7 +5787,7 @@ index d01d4ca873f8225d3503ecb102ce2eb7bfced421..5338d1638988c6fdd855eb9acf4fb7f6
return event;
}
@@ -1093,6 +1104,7 @@ public class CraftEventFactory {
@@ -1097,6 +1108,7 @@ public class CraftEventFactory {
EntityDamageEvent event;
if (damager != null) {
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);