Small fix

Shoukozumi · Jan 29, 2016 · 6087b6c · 6087b6c
1 parent baa986c
commit 6087b6c
Show file tree

Hide file tree

Showing 9 changed files with 609 additions and 191 deletions.
diff --git a/src/main/java/cn/nukkit/Player.java b/src/main/java/cn/nukkit/Player.java
@@ -2829,6 +2829,11 @@ public void handleDataPacket(DataPacket packet) {
                 } else if (this.windowIndex.containsKey(containerSetSlotPacket.windowid)) {
                     this.craftingType = 0;
                     Inventory inv = this.windowIndex.get(containerSetSlotPacket.windowid);
+
+                    if (inv instanceof EnchantInventory && containerSetSlotPacket.item.hasEnchantments()) {
+                        ((EnchantInventory) inv).onEnchant(this, inv.getItem(containerSetSlotPacket.slot), containerSetSlotPacket.item);
+                    }
+
                     transaction = new BaseTransaction(inv, containerSetSlotPacket.slot, inv.getItem(containerSetSlotPacket.slot), containerSetSlotPacket.item);
                 } else {
                     break;

diff --git a/src/main/java/cn/nukkit/block/EnchantingTable.java b/src/main/java/cn/nukkit/block/EnchantingTable.java
@@ -60,7 +60,9 @@ public boolean canBeActivated() {
     @Override
     public int[][] getDrops(Item item) {
         if (item.isPickaxe()) {
-            return new int[][]{{Item.ENCHANTING_TABLE, 0, 1}};
+            return new int[][]{
+                    {Item.ENCHANTING_TABLE, 0, 1}
+            };
         }
         return new int[][]{{}};
     }

diff --git a/src/main/java/cn/nukkit/inventory/BaseInventory.java b/src/main/java/cn/nukkit/inventory/BaseInventory.java
@@ -100,7 +100,7 @@ public Item getItem(int index) {
 
     @Override
     public Map<Integer, Item> getContents() {
-        return this.slots;
+        return new HashMap<>(this.slots);
     }
 
     @Override