mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-26 22:50:23 +02:00
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
Bukkit Changes:
565a5727 #533: Add consumed item, hand and consumeItem boolean to EntityShootBowEvent
CraftBukkit Changes:
927200a9
#718: Add consumed item, hand and consumeItem boolean to EntityShootBowEvent
153 lines
7.8 KiB
Diff
153 lines
7.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Fri, 12 Oct 2018 14:10:46 -0500
|
|
Subject: [PATCH] Add more Witch API
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
|
|
index fc58cce8455dcf244355189fabb1a76114c19368..0ef981e5ad1c928fbcf32e83e28285e690df1775 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityWitch.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityWitch.java
|
|
@@ -1,5 +1,11 @@
|
|
package net.minecraft.server;
|
|
|
|
+// Paper start
|
|
+import com.destroystokyo.paper.event.entity.WitchReadyPotionEvent;
|
|
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
|
|
+import org.bukkit.entity.Witch;
|
|
+// Paper end
|
|
+
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
import java.util.UUID;
|
|
@@ -10,7 +16,7 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
|
|
private static final UUID b = UUID.fromString("5CD17E52-A79A-43D3-A529-90FDE04B181E");
|
|
private static final AttributeModifier bo = new AttributeModifier(EntityWitch.b, "Drinking speed penalty", -0.25D, AttributeModifier.Operation.ADDITION);
|
|
private static final DataWatcherObject<Boolean> bp = DataWatcher.a(EntityWitch.class, DataWatcherRegistry.i);
|
|
- private int bq;
|
|
+ private int bq; public int getPotionUseTimeLeft() { return bq; } public void setPotionUseTimeLeft(int timeLeft) { bq = timeLeft; } // Paper - OBFHELPER
|
|
private PathfinderGoalNearestHealableRaider<EntityRaider> br;
|
|
private PathfinderGoalNearestAttackableTargetWitch<EntityHuman> bs;
|
|
|
|
@@ -56,10 +62,12 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
|
|
return SoundEffects.ENTITY_WITCH_DEATH;
|
|
}
|
|
|
|
+ public void setDrinkingPotion(boolean drinkingPotion) { v(drinkingPotion); } // Paper - OBFHELPER
|
|
public void v(boolean flag) {
|
|
this.getDataWatcher().set(EntityWitch.bp, flag);
|
|
}
|
|
|
|
+ public boolean isDrinkingPotion() { return m(); } // Paper - OBFHELPER
|
|
public boolean m() {
|
|
return (Boolean) this.getDataWatcher().get(EntityWitch.bp);
|
|
}
|
|
@@ -118,21 +126,24 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
|
|
}
|
|
|
|
if (potionregistry != null) {
|
|
- // Paper start
|
|
ItemStack potion = PotionUtil.a(new ItemStack(Items.POTION), potionregistry);
|
|
- org.bukkit.inventory.ItemStack bukkitStack = com.destroystokyo.paper.event.entity.WitchReadyPotionEvent.process((org.bukkit.entity.Witch) this.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(potion));
|
|
- this.setSlot(EnumItemSlot.MAINHAND, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(bukkitStack));
|
|
+ // Paper start - logic moved into setDrinkingPotion, copy exact impl into the method and then comment out
|
|
+ this.setDrinkingPotion(potion);
|
|
+// org.bukkit.inventory.ItemStack bukkitStack = com.destroystokyo.paper.event.entity.WitchReadyPotionEvent.process((org.bukkit.entity.Witch) this.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(potion));
|
|
+// this.setSlot(EnumItemSlot.MAINHAND, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(bukkitStack));
|
|
+// // Paper end
|
|
+// this.bq = this.getItemInMainHand().k();
|
|
+// this.v(true);
|
|
+// if (!this.isSilent()) {
|
|
+// this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_WITCH_DRINK, this.getSoundCategory(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
|
|
+// }
|
|
+//
|
|
+// AttributeModifiable attributemodifiable = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED);
|
|
+//
|
|
+// attributemodifiable.removeModifier(EntityWitch.bo);
|
|
+// attributemodifiable.b(EntityWitch.bo);
|
|
// Paper end
|
|
- this.bq = this.getItemInMainHand().k();
|
|
- this.v(true);
|
|
- if (!this.isSilent()) {
|
|
- this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_WITCH_DRINK, this.getSoundCategory(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
|
|
- }
|
|
|
|
- AttributeModifiable attributemodifiable = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED);
|
|
-
|
|
- attributemodifiable.removeModifier(EntityWitch.bo);
|
|
- attributemodifiable.b(EntityWitch.bo);
|
|
}
|
|
}
|
|
|
|
@@ -144,6 +155,24 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
|
|
super.movementTick();
|
|
}
|
|
|
|
+ // Paper start - moved to its own method
|
|
+ public void setDrinkingPotion(ItemStack potion) {
|
|
+ org.bukkit.inventory.ItemStack bukkitStack = com.destroystokyo.paper.event.entity.WitchReadyPotionEvent.process((org.bukkit.entity.Witch) this.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(potion));
|
|
+ this.setSlot(EnumItemSlot.MAINHAND, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(bukkitStack));
|
|
+ // Paper end
|
|
+ this.bq = this.getItemInMainHand().k();
|
|
+ this.v(true);
|
|
+ if (!this.isSilent()) {
|
|
+ this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_WITCH_DRINK, this.getSoundCategory(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
|
|
+ }
|
|
+
|
|
+ AttributeModifiable attributemodifiable = this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED);
|
|
+
|
|
+ attributemodifiable.removeModifier(EntityWitch.bo);
|
|
+ attributemodifiable.b(EntityWitch.bo);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public SoundEffect eL() {
|
|
return SoundEffects.ENTITY_WITCH_CELEBRATE;
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
|
|
index bae107e76e4c8df446d4a7be8dda291d820074d7..c3138a6d24df1e71910791e67284983d8cd500f2 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
|
|
@@ -1,10 +1,16 @@
|
|
package org.bukkit.craftbukkit.entity;
|
|
|
|
-import com.destroystokyo.paper.entity.CraftRangedEntity; // Paper
|
|
import net.minecraft.server.EntityWitch;
|
|
import org.bukkit.craftbukkit.CraftServer;
|
|
import org.bukkit.entity.EntityType;
|
|
import org.bukkit.entity.Witch;
|
|
+// Paper start
|
|
+import com.destroystokyo.paper.entity.CraftRangedEntity;
|
|
+import com.google.common.base.Preconditions;
|
|
+import org.bukkit.Material;
|
|
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
|
|
+import org.bukkit.inventory.ItemStack;
|
|
+// Paper end
|
|
|
|
public class CraftWitch extends CraftRaider implements Witch, CraftRangedEntity<EntityWitch> { // Paper
|
|
public CraftWitch(CraftServer server, EntityWitch entity) {
|
|
@@ -25,4 +31,23 @@ public class CraftWitch extends CraftRaider implements Witch, CraftRangedEntity<
|
|
public EntityType getType() {
|
|
return EntityType.WITCH;
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ public boolean isDrinkingPotion() {
|
|
+ return getHandle().isDrinkingPotion();
|
|
+ }
|
|
+
|
|
+ public int getPotionUseTimeLeft() {
|
|
+ return getHandle().getPotionUseTimeLeft();
|
|
+ }
|
|
+
|
|
+ public ItemStack getDrinkingPotion() {
|
|
+ return CraftItemStack.asCraftMirror(getHandle().getItemInMainHand());
|
|
+ }
|
|
+
|
|
+ public void setDrinkingPotion(ItemStack potion) {
|
|
+ Preconditions.checkArgument(potion == null || potion.getType().isEmpty() || potion.getType() == Material.POTION, "must be potion, air, or null");
|
|
+ getHandle().setDrinkingPotion(CraftItemStack.asNMSCopy(potion));
|
|
+ }
|
|
+ // Paper end
|
|
}
|