Paper/patches/server/0260-Add-more-Witch-API.patch

102 lines
4.9 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
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
== AT ==
public net.minecraft.world.entity.monster.Witch usingTime
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
2024-04-24 07:43:09 +02:00
index d286239d02b81624124c4e32ff4413bbac902d54..5803c1d36b769f0186baa0665976749765b4cb61 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
2024-04-24 07:43:09 +02:00
@@ -150,21 +150,7 @@ public class Witch extends Raider implements RangedAttackMob {
2021-06-11 14:02:28 +02:00
}
2024-04-24 07:43:09 +02:00
if (holder != null) {
2021-06-11 14:02:28 +02:00
- // Paper start
2024-04-24 07:43:09 +02:00
- ItemStack potion = PotionContents.createItemStack(Items.POTION, holder);
2024-02-01 10:15:57 +01:00
- potion = org.bukkit.craftbukkit.event.CraftEventFactory.handleWitchReadyPotionEvent(this, potion);
- this.setItemSlot(EquipmentSlot.MAINHAND, potion);
- // Paper end
2021-06-11 14:02:28 +02:00
- 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);
2021-06-11 14:02:28 +02:00
- }
-
2023-03-23 22:57:03 +01:00
- AttributeInstance attributemodifiable = this.getAttribute(Attributes.MOVEMENT_SPEED);
2023-09-22 00:26:51 +02:00
-
2024-04-24 07:43:09 +02:00
- attributemodifiable.removeModifier(Witch.SPEED_MODIFIER_DRINKING.id());
2021-06-11 14:02:28 +02:00
- attributemodifiable.addTransientModifier(Witch.SPEED_MODIFIER_DRINKING);
2024-04-24 07:43:09 +02:00
+ this.setDrinkingPotion(PotionContents.createItemStack(Items.POTION, holder)); // Paper - logic moved into setDrinkingPotion, copy exact impl into the method and then comment out
2021-06-11 14:02:28 +02:00
}
}
2024-04-24 07:43:09 +02:00
@@ -176,6 +162,23 @@ public class Witch extends Raider implements RangedAttackMob {
2021-06-11 14:02:28 +02:00
super.aiStep();
}
+ // Paper start - moved to its own method
+ public void setDrinkingPotion(ItemStack potion) {
2024-02-01 10:15:57 +01:00
+ potion = org.bukkit.craftbukkit.event.CraftEventFactory.handleWitchReadyPotionEvent(this, potion);
+ this.setItemSlot(EquipmentSlot.MAINHAND, potion);
2021-06-11 14:02:28 +02:00
+ 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);
2021-06-11 14:02:28 +02:00
+ }
+
+ AttributeInstance attributemodifiable = this.getAttribute(Attributes.MOVEMENT_SPEED);
+
2024-04-24 07:43:09 +02:00
+ attributemodifiable.removeModifier(Witch.SPEED_MODIFIER_DRINKING.id());
2021-06-11 14:02:28 +02:00
+ 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
2023-12-05 18:20:55 +01:00
index 524b5ba5995affc09eedf9a85d22e8b0b4efc156..4b3d783cabcb2de1a67d7fbfb6f525bfb493aed1 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
@@ -2,6 +2,13 @@ package org.bukkit.craftbukkit.entity;
2021-06-11 14:02:28 +02:00
import org.bukkit.craftbukkit.CraftServer;
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) {
@@ -22,4 +29,23 @@ public class CraftWitch extends CraftRaider implements Witch, com.destroystokyo.
public boolean isDrinkingPotion() {
return this.getHandle().isDrinkingPotion();
2021-06-11 14:02:28 +02:00
}
+ // Paper start
+ public int getPotionUseTimeLeft() {
2021-06-17 23:39:36 +02:00
+ return getHandle().usingTime;
2021-06-11 14:02:28 +02:00
+ }
+
+ @Override
+ public void setPotionUseTimeLeft(int ticks) {
2021-06-17 23:39:36 +02:00
+ getHandle().usingTime = ticks;
2021-06-11 14:02:28 +02:00
+ }
+
+ 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
}