SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.8.3

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
paper-server/nms-patches/InventoryMerchant.patch
View File

@@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde/net/minecraft/server/InventoryMerchant.java 2015-02-06 20:41:38.537609199 +1100
+++ src/main/java/net/minecraft/server/InventoryMerchant.java 2015-02-06 20:41:38.537609199 +1100
--- /home/matt/mc-dev-private//net/minecraft/server/InventoryMerchant.java 2015-02-26 22:40:22.783608137 +0000
+++ src/main/java/net/minecraft/server/InventoryMerchant.java 2015-02-26 22:40:22.783608137 +0000
@@ -1,5 +1,12 @@
package net.minecraft.server;
@@ -44,8 +44,8 @@
+ public org.bukkit.inventory.InventoryHolder getOwner() {
+ return (CraftVillager) ((EntityVillager) this.merchant).getBukkitEntity();
+ }
+ // CraftBukkit end
+
+ // CraftBukkit end
+
public InventoryMerchant(EntityHuman entityhuman, IMerchant imerchant) {
this.player = entityhuman;
this.merchant = imerchant;