Update to Minecraft 1.16.1

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-06-25 10:00:00 +10:00
parent 3862d2811e
commit 50503fd516
424 changed files with 5960 additions and 5636 deletions

View File

@@ -1,20 +1,6 @@
--- a/net/minecraft/server/ItemTrident.java
+++ b/net/minecraft/server/ItemTrident.java
@@ -6,9 +6,13 @@
public ItemTrident(Item.Info item_info) {
super(item_info);
+ // CraftBukkit start - obfuscator went a little crazy
+ /*
this.a(new MinecraftKey("throwing"), (itemstack, world, entityliving) -> {
return entityliving != null && entityliving.isHandRaised() && entityliving.dD() == itemstack ? 1.0F : 0.0F;
});
+ */
+ // CraftBukkit end
}
@Override
@@ -37,9 +41,12 @@
@@ -43,9 +43,12 @@
if (k <= 0 || entityhuman.isInWaterOrRain()) {
if (!world.isClientSide) {
@@ -27,7 +13,7 @@
if (k == 0) {
EntityThrownTrident entitythrowntrident = new EntityThrownTrident(world, entityhuman, itemstack);
@@ -48,16 +55,40 @@
@@ -54,16 +57,40 @@
entitythrowntrident.fromPlayer = EntityArrow.PickupStatus.CREATIVE_ONLY;
}