From cdb7cb852fb0557b09a04be4229d785f61e17cdd Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Sat, 20 Mar 2021 08:55:48 +1100 Subject: [PATCH] Fix broken wandering traders By: md_5 --- .../net/minecraft/world/entity/npc/EntityVillagerTrader.patch | 2 +- .../net/minecraft/world/entity/npc/MobSpawnerTrader.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillagerTrader.patch b/paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillagerTrader.patch index e1bdb721536..598be12eba7 100644 --- a/paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillagerTrader.patch +++ b/paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillagerTrader.patch @@ -18,7 +18,7 @@ public EntityVillagerTrader(EntityTypes entitytypes, World world) { super(entitytypes, world); this.attachedToPlayer = true; -+ this.u(48000); // CraftBukkit - set default from MobSpawnerTrader ++ this.setDespawnDelay(48000); // CraftBukkit - set default from MobSpawnerTrader } @Override diff --git a/paper-server/nms-patches/net/minecraft/world/entity/npc/MobSpawnerTrader.patch b/paper-server/nms-patches/net/minecraft/world/entity/npc/MobSpawnerTrader.patch index 7bd0390c954..4ee857c16e7 100644 --- a/paper-server/nms-patches/net/minecraft/world/entity/npc/MobSpawnerTrader.patch +++ b/paper-server/nms-patches/net/minecraft/world/entity/npc/MobSpawnerTrader.patch @@ -14,7 +14,7 @@ this.b.a(entityvillagertrader.getUniqueID()); - entityvillagertrader.setDespawnDelay(48000); -+ // entityvillagertrader.u(48000); // CraftBukkit - moved to EntityVillagerTrader constructor. This lets the value be modified by plugins on CreatureSpawnEvent ++ // entityvillagertrader.setDespawnDelay(48000); // CraftBukkit - moved to EntityVillagerTrader constructor. This lets the value be modified by plugins on CreatureSpawnEvent entityvillagertrader.g(blockposition1); entityvillagertrader.a(blockposition1, 16); return true;