66 lines
3.3 KiB
Diff
66 lines
3.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: HexedHero <6012891+HexedHero@users.noreply.github.com>
|
||
|
|
Date: Thu, 6 May 2021 14:56:43 +0100
|
||
|
|
Subject: [PATCH] Add more WanderingTrader API
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
|
||
|
|
index 04c4cca4be8886feb59f180915977b77f9c7dde8..22a695ee3f6c60d484285f1b441b809da61f2436 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
|
||
|
|
@@ -57,6 +57,10 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
|
||
|
|
@Nullable
|
||
|
|
private BlockPos wanderTarget;
|
||
|
|
private int despawnDelay;
|
||
|
|
+ // Paper start - Add more WanderingTrader API
|
||
|
|
+ public boolean canDrinkPotion = true;
|
||
|
|
+ public boolean canDrinkMilk = true;
|
||
|
|
+ // Paper end
|
||
|
|
|
||
|
|
public WanderingTrader(EntityType<? extends WanderingTrader> type, Level world) {
|
||
|
|
super(type, world);
|
||
|
|
@@ -68,10 +72,10 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
|
||
|
|
protected void registerGoals() {
|
||
|
|
this.goalSelector.addGoal(0, new FloatGoal(this));
|
||
|
|
this.goalSelector.addGoal(0, new UseItemGoal<>(this, PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.INVISIBILITY), SoundEvents.WANDERING_TRADER_DISAPPEARED, (entityvillagertrader) -> {
|
||
|
|
- return this.world.isNight() && !entityvillagertrader.isInvisible();
|
||
|
|
+ return canDrinkPotion && this.world.isNight() && !entityvillagertrader.isInvisible(); // Paper - Add more WanderingTrader API
|
||
|
|
}));
|
||
|
|
this.goalSelector.addGoal(0, new UseItemGoal<>(this, new ItemStack(Items.MILK_BUCKET), SoundEvents.WANDERING_TRADER_REAPPEARED, (entityvillagertrader) -> {
|
||
|
|
- return this.level.isDay() && entityvillagertrader.isInvisible();
|
||
|
|
+ return canDrinkMilk && this.level.isDay() && entityvillagertrader.isInvisible(); // Paper - Add more WanderingTrader API
|
||
|
|
}));
|
||
|
|
this.goalSelector.addGoal(1, new TradeWithPlayerGoal(this));
|
||
|
|
this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Zombie.class, 8.0F, 0.5D, 0.5D));
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
|
||
|
|
index a00b1ee5d80d3918ece2260dc1360aa90de16c8a..de58fc26bd811e87cd393bdecee796faf72e65e1 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWanderingTrader.java
|
||
|
|
@@ -34,4 +34,26 @@ public class CraftWanderingTrader extends CraftAbstractVillager implements Wande
|
||
|
|
public void setDespawnDelay(int despawnDelay) {
|
||
|
|
getHandle().setDespawnDelay(despawnDelay);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ // Paper start - Add more WanderingTrader API
|
||
|
|
+ @Override
|
||
|
|
+ public void setCanDrinkPotion(boolean bool) {
|
||
|
|
+ getHandle().canDrinkPotion = bool;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ @Override
|
||
|
|
+ public boolean canDrinkPotion() {
|
||
|
|
+ return getHandle().canDrinkPotion;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ @Override
|
||
|
|
+ public void setCanDrinkMilk(boolean bool) {
|
||
|
|
+ getHandle().canDrinkMilk = bool;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ @Override
|
||
|
|
+ public boolean canDrinkMilk() {
|
||
|
|
+ return getHandle().canDrinkMilk;
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
}
|