diff options
author | Wesley Wolfe <weswolf@aol.com> | 2012-07-22 01:18:00 -0500 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2012-07-23 23:55:31 -0500 |
commit | b00de5f1768e14238f8660b63eb3fd5d744fc0a9 (patch) | |
tree | 2c1407b1ef81f38e16f3c4e453bec077dfd1eb53 /src/main/java/net/minecraft/server/InventoryCrafting.java | |
parent | 8b9aad8c2b4057ab33a7bff2b8711d0d48c13568 (diff) | |
download | craftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.tar craftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.tar.gz craftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.tar.lz craftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.tar.xz craftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.zip |
Cleaned up CraftBukkit comments in NMS.
Added newlines at the end of files
Fixed improper line endings on some files
Matched start - end comments
Added some missing comments for diffs
Fixed syntax on some spots
Minimized some diff
Removed some no longer used files
Added comment on some required files with no changes
Fixed imports of items used once
Added imports for items used more than once
Diffstat (limited to 'src/main/java/net/minecraft/server/InventoryCrafting.java')
-rw-r--r-- | src/main/java/net/minecraft/server/InventoryCrafting.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/InventoryCrafting.java b/src/main/java/net/minecraft/server/InventoryCrafting.java index 857ad0e7..be99de8d 100644 --- a/src/main/java/net/minecraft/server/InventoryCrafting.java +++ b/src/main/java/net/minecraft/server/InventoryCrafting.java @@ -1,13 +1,11 @@ package net.minecraft.server; // CraftBukkit start -import java.util.ArrayList; import java.util.List; import org.bukkit.craftbukkit.entity.CraftHumanEntity; import org.bukkit.entity.HumanEntity; import org.bukkit.event.inventory.InventoryType; -import org.bukkit.inventory.InventoryHolder; // CraftBukkit end public class InventoryCrafting implements IInventory { @@ -17,7 +15,7 @@ public class InventoryCrafting implements IInventory { private Container c; // CraftBukkit start - public List<HumanEntity> transaction = new ArrayList<HumanEntity>(); + public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>(); public CraftingRecipe currentRecipe; public IInventory resultInventory; private EntityHuman owner; @@ -43,7 +41,7 @@ public class InventoryCrafting implements IInventory { return transaction; } - public InventoryHolder getOwner() { + public org.bukkit.inventory.InventoryHolder getOwner() { return owner.getBukkitEntity(); } |