mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-30 16:49:42 +02:00
129 lines
6.7 KiB
Diff
129 lines
6.7 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/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
|
|
index e26ce4d8b3a3af8d6347f8c8c36703aeb06da520..8c3e8c12d7405ad388342e304430834a5fad12a9 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
|
|
@@ -1,5 +1,8 @@
|
|
package net.minecraft.world.entity.monster;
|
|
|
|
+// Paper start
|
|
+import com.destroystokyo.paper.event.entity.WitchReadyPotionEvent;
|
|
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
import java.util.UUID;
|
|
@@ -157,21 +160,24 @@ public class Witch extends Raider implements RangedAttackMob {
|
|
}
|
|
|
|
if (potionregistry != null) {
|
|
- // Paper start
|
|
ItemStack potion = PotionUtils.setPotion(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.setItemSlot(EquipmentSlot.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.usingTime = this.getMainHandItem().getUseDuration();
|
|
- this.setUsingItem(true);
|
|
- if (!this.isSilent()) {
|
|
- this.level.playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.WITCH_DRINK, this.getSoundSource(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
|
|
- }
|
|
-
|
|
- AttributeInstance attributemodifiable = this.getAttribute(Attributes.MOVEMENT_SPEED);
|
|
|
|
- attributemodifiable.removeModifier(Witch.SPEED_MODIFIER_DRINKING);
|
|
- attributemodifiable.addTransientModifier(Witch.SPEED_MODIFIER_DRINKING);
|
|
}
|
|
}
|
|
|
|
@@ -183,6 +189,24 @@ public class Witch extends Raider implements RangedAttackMob {
|
|
super.aiStep();
|
|
}
|
|
|
|
+ // 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.setItemSlot(EquipmentSlot.MAINHAND, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(bukkitStack));
|
|
+ // Paper end
|
|
+ this.usingTime = this.getMainHandItem().getUseDuration();
|
|
+ this.setUsingItem(true);
|
|
+ if (!this.isSilent()) {
|
|
+ this.level.playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.WITCH_DRINK, this.getSoundSource(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
|
|
+ }
|
|
+
|
|
+ AttributeInstance attributemodifiable = this.getAttribute(Attributes.MOVEMENT_SPEED);
|
|
+
|
|
+ attributemodifiable.removeModifier(Witch.SPEED_MODIFIER_DRINKING);
|
|
+ attributemodifiable.addTransientModifier(Witch.SPEED_MODIFIER_DRINKING);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public SoundEvent getCelebrateSound() {
|
|
return SoundEvents.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 d4eeb071dbbfca3ecea256228853bcb5c11f49ee..8625d8d7ac94dca2acc348a4c3c912d39cd22b47 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
|
|
@@ -3,6 +3,13 @@ package org.bukkit.craftbukkit.entity;
|
|
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, com.destroystokyo.paper.entity.CraftRangedEntity<net.minecraft.world.entity.monster.Witch> { // Paper
|
|
public CraftWitch(CraftServer server, net.minecraft.world.entity.monster.Witch entity) {
|
|
@@ -23,4 +30,28 @@ public class CraftWitch extends CraftRaider implements Witch, com.destroystokyo.
|
|
public EntityType getType() {
|
|
return EntityType.WITCH;
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ public boolean isDrinkingPotion() {
|
|
+ return getHandle().isDrinkingPotion();
|
|
+ }
|
|
+
|
|
+ public int getPotionUseTimeLeft() {
|
|
+ return getHandle().usingTime;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setPotionUseTimeLeft(int ticks) {
|
|
+ getHandle().usingTime = ticks;
|
|
+ }
|
|
+
|
|
+ public ItemStack getDrinkingPotion() {
|
|
+ return CraftItemStack.asCraftMirror(getHandle().getMainHandItem());
|
|
+ }
|
|
+
|
|
+ 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
|
|
}
|