From 4b70322112172f8cdd1ef3fc98d39eb229a0cd67 Mon Sep 17 00:00:00 2001 From: Tschipp Date: Mon, 18 Sep 2017 17:03:47 +0200 Subject: [PATCH] Fixed Minecart dupe glitch --- src/main/java/tschipp/carryon/CarryOn.java | 2 +- .../tschipp/carryon/common/event/ItemEntityEvents.java | 10 ++++++++++ src/main/resources/mcmod.info | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/tschipp/carryon/CarryOn.java b/src/main/java/tschipp/carryon/CarryOn.java index 7beda0e..30c3538 100644 --- a/src/main/java/tschipp/carryon/CarryOn.java +++ b/src/main/java/tschipp/carryon/CarryOn.java @@ -29,7 +29,7 @@ public class CarryOn { public static CarryOn instance; public static final String MODID = "carryon"; - public static final String VERSION = "1.5"; + public static final String VERSION = "1.5.1"; public static final String NAME = "Carry On"; public static final String UPDATE_JSON = "https://gist.githubusercontent.com/Tschipp/dccadee7c90d7a34e6e76a35d9d6fa2e/raw/"; public static final Logger LOGGER = LogManager.getFormatterLogger("CarryOn"); diff --git a/src/main/java/tschipp/carryon/common/event/ItemEntityEvents.java b/src/main/java/tschipp/carryon/common/event/ItemEntityEvents.java index c846553..a025b33 100644 --- a/src/main/java/tschipp/carryon/common/event/ItemEntityEvents.java +++ b/src/main/java/tschipp/carryon/common/event/ItemEntityEvents.java @@ -18,6 +18,8 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; import tschipp.carryon.CarryOn; import tschipp.carryon.client.keybinds.CarryOnKeybinds; import tschipp.carryon.common.handler.PickupHandler; @@ -87,6 +89,14 @@ public class ItemEntityEvents { if (ItemEntity.storeEntityData(entity, world, stack)) { + if(entity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) + { + IItemHandler handler = entity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); + for(int i = 0; i < handler.getSlots(); i++) + { + handler.extractItem(i, 64, false); + } + } CarryOn.network.sendTo(new CarrySlotPacket(player.inventory.currentItem), (EntityPlayerMP) player); entity.setDead(); player.setHeldItem(EnumHand.MAIN_HAND, stack); diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 2aafec5..0b81080 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ { "modid" : "carryon", "name" : "Carry On", - "version" : "1.5", "mcversion" : "1.11.2", + "version" : "1.5.1", "mcversion" : "1.11.2", "url" : "", "credits" : "Tschipp, Purplicious_Cow, cy4n", "authorList" : ["Tschipp, Purplicious_Cow, cy4n"],