mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-10 17:52:02 -07:00
Update to Minecraft 1.13-pre7
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
--- a/net/minecraft/server/EntityPotion.java
|
||||
+++ b/net/minecraft/server/EntityPotion.java
|
||||
@@ -6,6 +6,12 @@
|
||||
import javax.annotation.Nullable;
|
||||
@@ -5,6 +5,12 @@
|
||||
import java.util.function.Predicate;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
+// CraftBukkit start
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
public class EntityPotion extends EntityProjectile {
|
||||
|
||||
@@ -87,7 +93,7 @@
|
||||
@@ -77,7 +83,7 @@
|
||||
|
||||
if (flag) {
|
||||
this.n();
|
||||
this.l();
|
||||
- } 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 {
|
||||
@@ -124,6 +130,7 @@
|
||||
@@ -114,6 +120,7 @@
|
||||
private void a(MovingObjectPosition movingobjectposition, List<MobEffect> list) {
|
||||
AxisAlignedBB axisalignedbb = this.getBoundingBox().grow(4.0D, 2.0D, 4.0D);
|
||||
List list1 = this.world.a(EntityLiving.class, axisalignedbb);
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
if (!list1.isEmpty()) {
|
||||
Iterator iterator = list1.iterator();
|
||||
@@ -141,21 +148,46 @@
|
||||
@@ -131,21 +138,46 @@
|
||||
d1 = 1.0D;
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -187,7 +219,14 @@
|
||||
@@ -177,7 +209,14 @@
|
||||
entityareaeffectcloud.setColor(nbttagcompound.getInt("CustomPotionColor"));
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user