Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
2780e94 Fix PaperTickList (#6241)
b854e7e Drop unneeded patch (#6240)
2961b2a Fix various mob drops being captured as death drops (#5675)
3801a39 Add ItemRarity test (#6247)
170382f Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6245)
This commit is contained in:
William Blake Galbreath
2021-07-23 10:55:13 -05:00
parent 0dad40ac19
commit dd259870b0
24 changed files with 172 additions and 170 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Toggle for water sensitive mob damage
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 67932ebc795c6d3b4b1956277ae9194c290ec599..eeb8f5413e3dfb88744891255514c65c9fda8fa8 100644
index 5bf98ddae4d3b141c3db3892a50638f1a4988e92..9eda9a48fb509f0484576a487a9d0f9cd42574e8 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -861,7 +861,7 @@ public abstract class Mob extends LivingEntity {
@@ -865,7 +865,7 @@ public abstract class Mob extends LivingEntity {
if (goalFloat.canUse()) goalFloat.tick();
this.getJumpControl().tick();
}
@@ -18,7 +18,7 @@ index 67932ebc795c6d3b4b1956277ae9194c290ec599..eeb8f5413e3dfb88744891255514c65c
}
return;
diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
index 69bb27e8223b4be0e410ab9dd10e4db2fd26e564..c66e72606c346d12d628b92dda97a997e503bdaf 100644
index 0549e3d3cd3a9fddcb0d8edc56fb1fddc1c19802..37d2de60ea0fdb3fe4dcfd72f154b33bae675b74 100644
--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
@@ -110,7 +110,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM