Update to Minecraft 1.14-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions

View File

@@ -1,7 +1,7 @@
--- a/net/minecraft/server/EntityPotion.java
+++ b/net/minecraft/server/EntityPotion.java
@@ -5,6 +5,12 @@
import java.util.function.Predicate;
@@ -6,6 +6,12 @@
import javax.annotation.Nullable;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+// CraftBukkit start
@@ -13,24 +13,24 @@
public class EntityPotion extends EntityProjectile {
@@ -77,7 +83,7 @@
@@ -79,7 +85,7 @@
if (flag) {
this.l();
this.splash();
- } else if (!list.isEmpty()) {
+ } else if (true || !list.isEmpty()) { // CraftBukkit - Call event even if no effects to apply
if (this.isLingering()) {
this.a(itemstack, potionregistry);
} else {
@@ -114,6 +120,7 @@
private void a(MovingObjectPosition movingobjectposition, List<MobEffect> list) {
@@ -116,6 +122,7 @@
private void a(List<MobEffect> list, @Nullable Entity entity) {
AxisAlignedBB axisalignedbb = this.getBoundingBox().grow(4.0D, 2.0D, 4.0D);
List<EntityLiving> list1 = this.world.a(EntityLiving.class, axisalignedbb);
+ Map<LivingEntity, Double> affected = new HashMap<LivingEntity, Double>(); // CraftBukkit
if (!list1.isEmpty()) {
Iterator iterator = list1.iterator();
@@ -131,21 +138,46 @@
@@ -133,21 +140,46 @@
d1 = 1.0D;
}
@@ -91,7 +91,7 @@
}
}
}
@@ -177,7 +209,14 @@
@@ -179,7 +211,14 @@
entityareaeffectcloud.setColor(nbttagcompound.getInt("CustomPotionColor"));
}