summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-07-22 09:51:22 +1000
committermd_5 <git@md-5.net>2017-07-22 09:51:22 +1000
commit5a12442f223f04b36ee78454419c7cb19e915aa7 (patch)
treeb29f03892e1f9c9188e7825b6a5b5a47d579bfb1 /nms-patches
parent9a82fa7785843e56b8799ca2b495b0ce115d79d6 (diff)
downloadcraftbukkit-5a12442f223f04b36ee78454419c7cb19e915aa7.tar
craftbukkit-5a12442f223f04b36ee78454419c7cb19e915aa7.tar.gz
craftbukkit-5a12442f223f04b36ee78454419c7cb19e915aa7.tar.lz
craftbukkit-5a12442f223f04b36ee78454419c7cb19e915aa7.tar.xz
craftbukkit-5a12442f223f04b36ee78454419c7cb19e915aa7.zip
SPIGOT-3433: Improve AreaEffectCloud#getSource
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/EntityCreeper.patch8
-rw-r--r--nms-patches/EntityPotion.patch10
2 files changed, 9 insertions, 9 deletions
diff --git a/nms-patches/EntityCreeper.patch b/nms-patches/EntityCreeper.patch
index b29ed0a4..5721057f 100644
--- a/nms-patches/EntityCreeper.patch
+++ b/nms-patches/EntityCreeper.patch
@@ -72,3 +72,11 @@
}
}
+@@ -202,6 +225,7 @@
+ if (!collection.isEmpty()) {
+ EntityAreaEffectCloud entityareaeffectcloud = new EntityAreaEffectCloud(this.world, this.locX, this.locY, this.locZ);
+
++ entityareaeffectcloud.setSource(this); // CraftBukkit
+ entityareaeffectcloud.setRadius(2.5F);
+ entityareaeffectcloud.setRadiusOnUse(-0.5F);
+ entityareaeffectcloud.setWaitTime(10);
diff --git a/nms-patches/EntityPotion.patch b/nms-patches/EntityPotion.patch
index f7ce8610..117e59dc 100644
--- a/nms-patches/EntityPotion.patch
+++ b/nms-patches/EntityPotion.patch
@@ -91,15 +91,7 @@
}
}
}
-@@ -167,6 +199,7 @@
- private void a(ItemStack itemstack, PotionRegistry potionregistry) {
- EntityAreaEffectCloud entityareaeffectcloud = new EntityAreaEffectCloud(this.world, this.locX, this.locY, this.locZ);
-
-+ entityareaeffectcloud.projectileSource = this.projectileSource; // CraftBukkit
- entityareaeffectcloud.setSource(this.getShooter());
- entityareaeffectcloud.setRadius(3.0F);
- entityareaeffectcloud.setRadiusOnUse(-0.5F);
-@@ -187,7 +220,14 @@
+@@ -187,7 +219,14 @@
entityareaeffectcloud.setColor(nbttagcompound.getInt("CustomPotionColor"));
}