Repackage patches

By: md_5 <git@md-5.net>
2021-03-16 09:00:00 +11:00
parent 2777f7b780
commit 18496e998f
433 changed files with 0 additions and 0 deletions
--- a/paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillager.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillager.patch
@@ -0,0 +1,119 @@
+--- a/net/minecraft/server/EntityVillager.java
+++ b/net/minecraft/server/EntityVillager.java
+@@ -19,6 +19,14 @@
+ import javax.annotation.Nullable;
+ import org.apache.logging.log4j.Logger;
+ 
+// CraftBukkit start
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.entity.Villager;
+import org.bukkit.event.entity.EntityTransformEvent;
+import org.bukkit.event.entity.VillagerReplenishTradeEvent;
+// CraftBukkit end
+
+ public class EntityVillager extends EntityVillagerAbstract implements ReputationHandler, VillagerDataHolder {
+ 
+     private static final DataWatcherObject<VillagerData> br = DataWatcher.a(EntityVillager.class, DataWatcherRegistry.q);
+@@ -64,7 +72,7 @@
+ 
+     @Override
+     public BehaviorController<EntityVillager> getBehaviorController() {
+-        return super.getBehaviorController();
+        return (BehaviorController<EntityVillager>) super.getBehaviorController(); // CraftBukkit - decompile error
+     }
+ 
+     @Override
+@@ -83,7 +91,7 @@
+     public void c(WorldServer worldserver) {
+         BehaviorController<EntityVillager> behaviorcontroller = this.getBehaviorController();
+ 
+-        behaviorcontroller.b(worldserver, (EntityLiving) this);
+        behaviorcontroller.b(worldserver, this); // CraftBukkit - decompile error
+         this.bg = behaviorcontroller.h();
+         this.a(this.getBehaviorController());
+     }
+@@ -133,7 +141,7 @@
+     @Override
+     protected void mobTick() {
+         this.world.getMethodProfiler().enter("villagerBrain");
+-        this.getBehaviorController().a((WorldServer) this.world, (EntityLiving) this);
+        this.getBehaviorController().a((WorldServer) this.world, this); // CraftBukkit - decompile error
+         this.world.getMethodProfiler().exit();
+         if (this.bF) {
+             this.bF = false;
+@@ -147,7 +155,7 @@
+                     this.bu = false;
+                 }
+ 
+-                this.addEffect(new MobEffect(MobEffects.REGENERATION, 200, 0));
+                this.addEffect(new MobEffect(MobEffects.REGENERATION, 200, 0), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.VILLAGER_TRADE); // CraftBukkit
+             }
+         }
+ 
+@@ -358,7 +366,14 @@
+             while (iterator.hasNext()) {
+                 MerchantRecipe merchantrecipe = (MerchantRecipe) iterator.next();
+ 
+-                merchantrecipe.increaseSpecialPrice(-MathHelper.d((float) i * merchantrecipe.getPriceMultiplier()));
+                // CraftBukkit start
+                int bonus = -MathHelper.d((float) i * merchantrecipe.getPriceMultiplier());
+                VillagerReplenishTradeEvent event = new VillagerReplenishTradeEvent((Villager) this.getBukkitEntity(), merchantrecipe.asBukkit(), bonus);
+                Bukkit.getPluginManager().callEvent(event);
+                if (!event.isCancelled()) {
+                    merchantrecipe.increaseSpecialPrice(event.getBonus());
+                }
+                // CraftBukkit end
+             }
+         }
+ 
+@@ -387,7 +402,7 @@
+     @Override
+     public void saveData(NBTTagCompound nbttagcompound) {
+         super.saveData(nbttagcompound);
+-        DataResult dataresult = VillagerData.a.encodeStart(DynamicOpsNBT.a, this.getVillagerData());
+        DataResult<NBTBase> dataresult = VillagerData.a.encodeStart(DynamicOpsNBT.a, this.getVillagerData()); // CraftBukkit - decompile error
+         Logger logger = EntityVillager.LOGGER;
+ 
+         logger.getClass();
+@@ -700,7 +715,12 @@
+             }
+ 
+             entitywitch.setPersistent();
+-            worldserver.addAllEntities(entitywitch);
+            // CraftBukkit start
+            if (CraftEventFactory.callEntityTransformEvent(this, entitywitch, EntityTransformEvent.TransformReason.LIGHTNING).isCancelled()) {
+                return;
+            }
+            worldserver.addAllEntities(entitywitch, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING);
+            // CraftBukkit end
+             this.fq();
+             this.die();
+         } else {
+@@ -833,7 +853,7 @@
+ 
+                 if (entityirongolem != null) {
+                     if (entityirongolem.a((GeneratorAccess) worldserver, EnumMobSpawn.MOB_SUMMONED) && entityirongolem.a((IWorldReader) worldserver)) {
+-                        worldserver.addAllEntities(entityirongolem);
+                        worldserver.addAllEntities(entityirongolem, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.VILLAGE_DEFENSE); // CraftBukkit
+                         return entityirongolem;
+                     }
+ 
+@@ -911,7 +931,7 @@
+     @Override
+     public void entitySleep(BlockPosition blockposition) {
+         super.entitySleep(blockposition);
+-        this.bg.setMemory(MemoryModuleType.LAST_SLEPT, (Object) this.world.getTime());
+        this.bg.setMemory(MemoryModuleType.LAST_SLEPT, this.world.getTime()); // CraftBukkit - decompile error
+         this.bg.removeMemory(MemoryModuleType.WALK_TARGET);
+         this.bg.removeMemory(MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE);
+     }
+@@ -919,7 +939,7 @@
+     @Override
+     public void entityWakeup() {
+         super.entityWakeup();
+-        this.bg.setMemory(MemoryModuleType.LAST_WOKEN, (Object) this.world.getTime());
+        this.bg.setMemory(MemoryModuleType.LAST_WOKEN, this.world.getTime()); // CraftBukkit - decompile error
+     }
+ 
+     private boolean b(long i) {
--- a/paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillagerAbstract.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillagerAbstract.patch
@@ -0,0 +1,52 @@
+--- a/net/minecraft/server/EntityVillagerAbstract.java
+++ b/net/minecraft/server/EntityVillagerAbstract.java
+@@ -5,14 +5,30 @@
+ import java.util.Set;
+ import javax.annotation.Nullable;
+ 
+// CraftBukkit start
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.inventory.CraftMerchant;
+import org.bukkit.craftbukkit.inventory.CraftMerchantRecipe;
+import org.bukkit.entity.AbstractVillager;
+import org.bukkit.event.entity.VillagerAcquireTradeEvent;
+// CraftBukkit end
+
+ public abstract class EntityVillagerAbstract extends EntityAgeable implements NPC, IMerchant {
+ 
+    // CraftBukkit start
+    private CraftMerchant craftMerchant;
+
+    @Override
+    public CraftMerchant getCraftMerchant() {
+        return (craftMerchant == null) ? craftMerchant = new CraftMerchant(this) : craftMerchant;
+    }
+    // CraftBukkit end
+     private static final DataWatcherObject<Integer> bp = DataWatcher.a(EntityVillagerAbstract.class, DataWatcherRegistry.b);
+     @Nullable
+     private EntityHuman tradingPlayer;
+     @Nullable
+     protected MerchantRecipeList trades;
+-    private final InventorySubcontainer inventory = new InventorySubcontainer(8);
+    private final InventorySubcontainer inventory = new InventorySubcontainer(8, (org.bukkit.craftbukkit.entity.CraftAbstractVillager) this.getBukkitEntity()); // CraftBukkit add argument
+ 
+     public EntityVillagerAbstract(EntityTypes<? extends EntityVillagerAbstract> entitytypes, World world) {
+         super(entitytypes, world);
+@@ -213,7 +229,16 @@
+             MerchantRecipe merchantrecipe = villagertrades_imerchantrecipeoption.a(this, this.random);
+ 
+             if (merchantrecipe != null) {
+-                merchantrecipelist.add(merchantrecipe);
+                // CraftBukkit start
+                VillagerAcquireTradeEvent event = new VillagerAcquireTradeEvent((AbstractVillager) getBukkitEntity(), merchantrecipe.asBukkit());
+                // Suppress during worldgen
+                if (this.valid) {
+                    Bukkit.getPluginManager().callEvent(event);
+                }
+                if (!event.isCancelled()) {
+                    merchantrecipelist.add(CraftMerchantRecipe.fromBukkit(event.getRecipe()).toMinecraft());
+                }
+                // CraftBukkit end
+             }
+         }
+ 
--- a/paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillagerTrader.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/npc/EntityVillagerTrader.patch
@@ -0,0 +1,42 @@
+--- a/net/minecraft/server/EntityVillagerTrader.java
+++ b/net/minecraft/server/EntityVillagerTrader.java
+@@ -3,6 +3,13 @@
+ import java.util.EnumSet;
+ import javax.annotation.Nullable;
+ 
+// CraftBukkit start
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.inventory.CraftMerchantRecipe;
+import org.bukkit.entity.AbstractVillager;
+import org.bukkit.event.entity.VillagerAcquireTradeEvent;
+// CraftBukkit end
+
+ public class EntityVillagerTrader extends EntityVillagerAbstract {
+ 
+     @Nullable
+@@ -12,6 +19,7 @@
+     public EntityVillagerTrader(EntityTypes<? extends EntityVillagerTrader> entitytypes, World world) {
+         super(entitytypes, world);
+         this.attachedToPlayer = true;
+        this.u(48000); // CraftBukkit - set default from MobSpawnerTrader
+     }
+ 
+     @Override
+@@ -89,7 +97,16 @@
+             MerchantRecipe merchantrecipe = villagertrades_imerchantrecipeoption.a(this, this.random);
+ 
+             if (merchantrecipe != null) {
+-                merchantrecipelist.add(merchantrecipe);
+                // CraftBukkit start
+                VillagerAcquireTradeEvent event = new VillagerAcquireTradeEvent((AbstractVillager) getBukkitEntity(), merchantrecipe.asBukkit());
+                // Suppress during worldgen
+                if (this.valid) {
+                    Bukkit.getPluginManager().callEvent(event);
+                }
+                if (!event.isCancelled()) {
+                    merchantrecipelist.add(CraftMerchantRecipe.fromBukkit(event.getRecipe()).toMinecraft());
+                }
+                // CraftBukkit end
+             }
+ 
+         }
--- a/paper-server/nms-patches/net/minecraft/world/entity/npc/MobSpawnerTrader.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/npc/MobSpawnerTrader.patch
@@ -0,0 +1,29 @@
+--- a/net/minecraft/server/MobSpawnerTrader.java
+++ b/net/minecraft/server/MobSpawnerTrader.java
+@@ -83,7 +83,7 @@
+                     return false;
+                 }
+ 
+-                EntityVillagerTrader entityvillagertrader = (EntityVillagerTrader) EntityTypes.WANDERING_TRADER.spawnCreature(worldserver, (NBTTagCompound) null, (IChatBaseComponent) null, (EntityHuman) null, blockposition2, EnumMobSpawn.EVENT, false, false);
+                EntityVillagerTrader entityvillagertrader = (EntityVillagerTrader) EntityTypes.WANDERING_TRADER.spawnCreature(worldserver, (NBTTagCompound) null, (IChatBaseComponent) null, (EntityHuman) null, blockposition2, EnumMobSpawn.EVENT, false, false, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit
+ 
+                 if (entityvillagertrader != null) {
+                     for (int i = 0; i < 2; ++i) {
+@@ -91,7 +91,7 @@
+                     }
+ 
+                     this.b.a(entityvillagertrader.getUniqueID());
+-                    entityvillagertrader.u(48000);
+                    // entityvillagertrader.u(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;
+@@ -106,7 +106,7 @@
+         BlockPosition blockposition = this.a((IWorldReader) worldserver, entityvillagertrader.getChunkCoordinates(), i);
+ 
+         if (blockposition != null) {
+-            EntityLlamaTrader entityllamatrader = (EntityLlamaTrader) EntityTypes.TRADER_LLAMA.spawnCreature(worldserver, (NBTTagCompound) null, (IChatBaseComponent) null, (EntityHuman) null, blockposition, EnumMobSpawn.EVENT, false, false);
+            EntityLlamaTrader entityllamatrader = (EntityLlamaTrader) EntityTypes.TRADER_LLAMA.spawnCreature(worldserver, (NBTTagCompound) null, (IChatBaseComponent) null, (EntityHuman) null, blockposition, EnumMobSpawn.EVENT, false, false, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit
+ 
+             if (entityllamatrader != null) {
+                 entityllamatrader.setLeashHolder(entityvillagertrader, true);