twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-21 15:23:50 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.14.1

Browse Source
This commit is contained in:
md_5
2019-05-14 10:00:00 +10:00
parent 1fee35bef3
commit 89c52b7b0e
60 changed files with 322 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nms-patches/EntityVillagerAbstract.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/EntityVillagerAbstract.java
+++ b/net/minecraft/server/EntityVillagerAbstract.java
@@ -4,14 +4,29 @@
@@ -4,15 +4,30 @@
import java.util.Iterator;
import java.util.Set;
import javax.annotation.Nullable;
@@ -22,16 +22,17 @@
+ return (craftMerchant == null) ? craftMerchant = new CraftMerchant(this) : craftMerchant;
+ }
+ // CraftBukkit end
private static final DataWatcherObject<Integer> bA = 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
private int bC;
public EntityVillagerAbstract(EntityTypes<? extends EntityVillagerAbstract> entitytypes, World world) {
@@ -198,7 +213,16 @@
super(entitytypes, world);
@@ -204,7 +219,16 @@
MerchantRecipe merchantrecipe = villagertrades_imerchantrecipeoption.a(this, this.random);
if (merchantrecipe != null) {