mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 04:55:47 +01:00
814c742554
Discussion ongoing in PR #449
47 lines
2.0 KiB
Diff
47 lines
2.0 KiB
Diff
--- a/net/minecraft/server/EntityTippedArrow.java
|
|
+++ b/net/minecraft/server/EntityTippedArrow.java
|
|
@@ -116,6 +116,25 @@
|
|
}
|
|
}
|
|
|
|
+ // CraftBukkit start accessor methods
|
|
+ public void refreshEffects() {
|
|
+ this.getDataWatcher().set(EntityTippedArrow.f, Integer.valueOf(PotionUtil.a((Collection) PotionUtil.a(this.potionRegistry, (Collection) this.effects))));
|
|
+ }
|
|
+
|
|
+ public String getType() {
|
|
+ return ((MinecraftKey) PotionRegistry.a.b(this.potionRegistry)).toString();
|
|
+ }
|
|
+
|
|
+ public void setType(String string) {
|
|
+ this.potionRegistry = PotionRegistry.a.get(new MinecraftKey(string));
|
|
+ this.datawatcher.set(EntityTippedArrow.f, Integer.valueOf(PotionUtil.a((Collection) PotionUtil.a(this.potionRegistry, (Collection) this.effects))));
|
|
+ }
|
|
+
|
|
+ public boolean isTipped() {
|
|
+ return !(this.effects.isEmpty() && this.potionRegistry == Potions.EMPTY);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
public int getColor() {
|
|
return ((Integer) this.datawatcher.get(EntityTippedArrow.f)).intValue();
|
|
}
|
|
@@ -180,7 +199,7 @@
|
|
|
|
while (iterator.hasNext()) {
|
|
mobeffect = (MobEffect) iterator.next();
|
|
- entityliving.addEffect(new MobEffect(mobeffect.getMobEffect(), Math.max(mobeffect.getDuration() / 8, 1), mobeffect.getAmplifier(), mobeffect.isAmbient(), mobeffect.isShowParticles()));
|
|
+ entityliving.addEffect(new MobEffect(mobeffect.getMobEffect(), Math.max(mobeffect.getDuration() / 8, 1), mobeffect.getAmplifier(), mobeffect.isAmbient(), mobeffect.isShowParticles()), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ARROW); // CraftBukkit
|
|
}
|
|
|
|
if (!this.effects.isEmpty()) {
|
|
@@ -188,7 +207,7 @@
|
|
|
|
while (iterator.hasNext()) {
|
|
mobeffect = (MobEffect) iterator.next();
|
|
- entityliving.addEffect(mobeffect);
|
|
+ entityliving.addEffect(mobeffect, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ARROW); // CraftBukkit
|
|
}
|
|
}
|
|
|