Updated Upstream (CraftBukkit)
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 8073dbec SPIGOT-5474: Just ignore bugged fireball data
This commit is contained in:
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerLaunchProjectileEvent
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/InteractionResultWrapper.java b/src/main/java/net/minecraft/server/InteractionResultWrapper.java
|
||||
index a6b96456bc..712bda1225 100644
|
||||
index a6b96456b..712bda122 100644
|
||||
--- a/src/main/java/net/minecraft/server/InteractionResultWrapper.java
|
||||
+++ b/src/main/java/net/minecraft/server/InteractionResultWrapper.java
|
||||
@@ -0,0 +0,0 @@ public class InteractionResultWrapper<T> {
|
||||
@@ -17,7 +17,7 @@ index a6b96456bc..712bda1225 100644
|
||||
return this.a;
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemEgg.java b/src/main/java/net/minecraft/server/ItemEgg.java
|
||||
index 89d399c9ff..15a536dab8 100644
|
||||
index 89d399c9f..15a536dab 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemEgg.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemEgg.java
|
||||
@@ -0,0 +0,0 @@ public class ItemEgg extends Item {
|
||||
@@ -55,7 +55,7 @@ index 89d399c9ff..15a536dab8 100644
|
||||
return InteractionResultWrapper.a(itemstack);
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemEnderPearl.java b/src/main/java/net/minecraft/server/ItemEnderPearl.java
|
||||
index 315e012740..34ad0c1190 100644
|
||||
index 315e01274..34ad0c119 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemEnderPearl.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemEnderPearl.java
|
||||
@@ -0,0 +0,0 @@ public class ItemEnderPearl extends Item {
|
||||
@@ -107,7 +107,7 @@ index 315e012740..34ad0c1190 100644
|
||||
return InteractionResultWrapper.a(itemstack);
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemExpBottle.java b/src/main/java/net/minecraft/server/ItemExpBottle.java
|
||||
index f83eb5c45e..1bcf582922 100644
|
||||
index f83eb5c45..1bcf58292 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemExpBottle.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemExpBottle.java
|
||||
@@ -0,0 +0,0 @@ public class ItemExpBottle extends Item {
|
||||
@@ -152,7 +152,7 @@ index f83eb5c45e..1bcf582922 100644
|
||||
return InteractionResultWrapper.a(itemstack);
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemLingeringPotion.java b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
|
||||
index c19b678cfb..7672e31fc0 100644
|
||||
index c19b678cf..7672e31fc 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemLingeringPotion.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemLingeringPotion.java
|
||||
@@ -0,0 +0,0 @@ public class ItemLingeringPotion extends ItemPotionThrowable {
|
||||
@@ -170,7 +170,7 @@ index c19b678cfb..7672e31fc0 100644
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemPotionThrowable.java b/src/main/java/net/minecraft/server/ItemPotionThrowable.java
|
||||
index 8f8f31b265..72dcf109f6 100644
|
||||
index 8f8f31b26..72dcf109f 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemPotionThrowable.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemPotionThrowable.java
|
||||
@@ -0,0 +0,0 @@ public class ItemPotionThrowable extends ItemPotion {
|
||||
@@ -207,7 +207,7 @@ index 8f8f31b265..72dcf109f6 100644
|
||||
return InteractionResultWrapper.a(itemstack);
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemSnowball.java b/src/main/java/net/minecraft/server/ItemSnowball.java
|
||||
index abbf2b7881..4ad2856961 100644
|
||||
index abbf2b788..4ad285696 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemSnowball.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemSnowball.java
|
||||
@@ -0,0 +0,0 @@ public class ItemSnowball extends Item {
|
||||
@@ -244,7 +244,7 @@ index abbf2b7881..4ad2856961 100644
|
||||
/*
|
||||
if (!entityhuman.abilities.canInstantlyBuild) {
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemSplashPotion.java b/src/main/java/net/minecraft/server/ItemSplashPotion.java
|
||||
index 18bd846cee..e71e933fff 100644
|
||||
index 18bd846ce..e71e933ff 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemSplashPotion.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemSplashPotion.java
|
||||
@@ -0,0 +0,0 @@ public class ItemSplashPotion extends ItemPotionThrowable {
|
||||
|
||||
Reference in New Issue
Block a user