Merge remote-tracking branch 'origin/1.10.2' into 1.10.2

EdwinMindcraft · Mar 14, 2018 · e265664 · e265664
2 parents 8018b4a + 064e7e8
commit e265664
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/am2/common/defs/BindingsDefs.java b/src/main/java/am2/common/defs/BindingsDefs.java
@@ -70,7 +70,7 @@ else if (SHAPE_GROUP.isPressed()){
 				shapeGroup = caster.getCurrentShapeGroup() + 1;
 				if (shapeGroup >= caster.getShapeGroupCount())
 					shapeGroup = 0;
-				((ItemSpellBook)curItem.getItem()).replaceAciveItemStack(curItem, spellStack);
+				((ItemSpellBook)curItem.getItem()).replaceActiveItemStack(curItem, spellStack);
 			}
 
 			AMNetHandler.INSTANCE.sendShapeGroupChangePacket(shapeGroup, clientPlayer.getEntityId());

diff --git a/src/main/java/am2/common/items/ItemSpellBook.java b/src/main/java/am2/common/items/ItemSpellBook.java
@@ -113,7 +113,7 @@ public ItemStack GetActiveItemStack(ItemStack bookStack){
 		return inventoryItems[GetActiveSlot(bookStack)].copy();
 	}
 
-	public void replaceAciveItemStack(ItemStack bookStack, ItemStack newstack){
+	public void replaceActiveItemStack(ItemStack bookStack, ItemStack newstack){
 		ItemStack[] inventoryItems = getMyInventory(bookStack);
 		int index = GetActiveSlot(bookStack);
 		inventoryItems[index] = newstack;

diff --git a/src/main/java/am2/common/packet/AMPacketProcessorServer.java b/src/main/java/am2/common/packet/AMPacketProcessorServer.java
@@ -379,7 +379,7 @@ private void handleCastingModeChange(byte[] data, EntityPlayerMP player){
 				ItemStack spellStack = ((ItemSpellBook) stack.getItem()).GetActiveItemStack(stack);
 				if (spellStack.hasCapability(SpellCaster.INSTANCE, null))
 					spellStack.getCapability(SpellCaster.INSTANCE, null).setCurentShapeGroup(newShapeGroupOrdinal);
-				((ItemSpellBook) stack.getItem()).replaceAciveItemStack(stack, spellStack);
+				((ItemSpellBook) stack.getItem()).replaceActiveItemStack(stack, spellStack);
 			}
 		}
 	}