twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-10 17:52:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.13-pre7

Browse Source
This commit is contained in:
md_5
2018-07-15 10:00:00 +10:00
parent 57ab4cfc6f
commit 421c1728c8
608 changed files with 17788 additions and 9378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
nms-patches/EntityVillager.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/EntityVillager.java
+++ b/net/minecraft/server/EntityVillager.java
@@ -6,6 +6,14 @@
@@ -7,6 +7,14 @@
import javax.annotation.Nullable;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -15,32 +15,16 @@
public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -18,13 +26,13 @@
@Nullable
private EntityHuman tradingPlayer;
@Nullable
- private MerchantRecipeList trades;
+ public MerchantRecipeList trades; // PAIL private -> public
private int bF;
private boolean bG;
private boolean bH;
public int riches;
private String bJ;
- private int bK;
+ public int bK; // PAIL private -> public // PAIL rename careerID
private int bL;
private boolean bM;
private boolean bN;
@@ -37,7 +45,7 @@
@@ -38,7 +46,7 @@
public EntityVillager(World world, int i) {
super(world);
- this.inventory = new InventorySubcontainer("Items", false, 8);
+ this.inventory = new InventorySubcontainer("Items", false, 8, (CraftVillager) this.getBukkitEntity()); // CraftBukkit add argument
super(EntityTypes.VILLAGER, world);
- this.inventory = new InventorySubcontainer(new ChatComponentText("Items"), 8);
+ this.inventory = new InventorySubcontainer(new ChatComponentText("Items"), 8, (CraftVillager) this.getBukkitEntity()); // CraftBukkit add argument
this.setProfession(i);
this.setSize(0.6F, 1.95F);
((Navigation) this.getNavigation()).a(true);
@@ -119,7 +127,14 @@
@@ -120,7 +128,14 @@
MerchantRecipe merchantrecipe = (MerchantRecipe) iterator.next();
if (merchantrecipe.h()) {
@@ -56,16 +40,7 @@
}
}
@@ -432,7 +447,7 @@
return this.trades;
}
- private void dx() {
+ public void dx() { // CraftBukkit private -> public // PAIL rename populateTrades
EntityVillager.IMerchantRecipeOption[][][] aentityvillager_imerchantrecipeoption = EntityVillager.bP[this.getProfession()];
if (this.bK != 0 && this.bL != 0) {
@@ -460,7 +475,20 @@
@@ -434,7 +449,20 @@
for (int l = 0; l < k; ++l) {
EntityVillager.IMerchantRecipeOption entityvillager_imerchantrecipeoption = aentityvillager_imerchantrecipeoption3[l];