diff --git a/src/main/java/com/lishid/openinv/internal/v1_4_5/SilentContainerChest.java b/src/main/java/com/lishid/openinv/internal/v1_4_5/SilentContainerChest.java index 6c77e5d..e3cdf45 100644 --- a/src/main/java/com/lishid/openinv/internal/v1_4_5/SilentContainerChest.java +++ b/src/main/java/com/lishid/openinv/internal/v1_4_5/SilentContainerChest.java @@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_4_5; import net.minecraft.server.v1_4_5.ContainerChest; import net.minecraft.server.v1_4_5.EntityHuman; import net.minecraft.server.v1_4_5.IInventory; +import net.minecraft.server.v1_4_5.PlayerInventory; public class SilentContainerChest extends ContainerChest { public IInventory inv; @@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest { } @Override - public void b(EntityHuman paramEntityHuman) { + public void b(EntityHuman entityHuman) { // Don't send close signal twice, might screw up + PlayerInventory playerinventory = entityHuman.inventory; + + if (playerinventory.getCarried() != null) { + entityHuman.drop(playerinventory.getCarried()); + playerinventory.setCarried(null); + } } } diff --git a/src/main/java/com/lishid/openinv/internal/v1_4_6/SilentContainerChest.java b/src/main/java/com/lishid/openinv/internal/v1_4_6/SilentContainerChest.java index 368b482..926c9de 100644 --- a/src/main/java/com/lishid/openinv/internal/v1_4_6/SilentContainerChest.java +++ b/src/main/java/com/lishid/openinv/internal/v1_4_6/SilentContainerChest.java @@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_4_6; import net.minecraft.server.v1_4_6.ContainerChest; import net.minecraft.server.v1_4_6.EntityHuman; import net.minecraft.server.v1_4_6.IInventory; +import net.minecraft.server.v1_4_6.PlayerInventory; public class SilentContainerChest extends ContainerChest { public IInventory inv; @@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest { } @Override - public void b(EntityHuman paramEntityHuman) { + public void b(EntityHuman entityHuman) { // Don't send close signal twice, might screw up + PlayerInventory playerinventory = entityHuman.inventory; + + if (playerinventory.getCarried() != null) { + entityHuman.drop(playerinventory.getCarried()); + playerinventory.setCarried(null); + } } } diff --git a/src/main/java/com/lishid/openinv/internal/v1_4_R1/SilentContainerChest.java b/src/main/java/com/lishid/openinv/internal/v1_4_R1/SilentContainerChest.java index b9715a1..45ea295 100644 --- a/src/main/java/com/lishid/openinv/internal/v1_4_R1/SilentContainerChest.java +++ b/src/main/java/com/lishid/openinv/internal/v1_4_R1/SilentContainerChest.java @@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_4_R1; import net.minecraft.server.v1_4_R1.ContainerChest; import net.minecraft.server.v1_4_R1.EntityHuman; import net.minecraft.server.v1_4_R1.IInventory; +import net.minecraft.server.v1_4_R1.PlayerInventory; public class SilentContainerChest extends ContainerChest { public IInventory inv; @@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest { } @Override - public void b(EntityHuman paramEntityHuman) { + public void b(EntityHuman entityHuman) { // Don't send close signal twice, might screw up + PlayerInventory playerinventory = entityHuman.inventory; + + if (playerinventory.getCarried() != null) { + entityHuman.drop(playerinventory.getCarried()); + playerinventory.setCarried(null); + } } } diff --git a/src/main/java/com/lishid/openinv/internal/v1_5_R2/SilentContainerChest.java b/src/main/java/com/lishid/openinv/internal/v1_5_R2/SilentContainerChest.java index c6d9307..97b11e1 100644 --- a/src/main/java/com/lishid/openinv/internal/v1_5_R2/SilentContainerChest.java +++ b/src/main/java/com/lishid/openinv/internal/v1_5_R2/SilentContainerChest.java @@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_5_R2; import net.minecraft.server.v1_5_R2.ContainerChest; import net.minecraft.server.v1_5_R2.EntityHuman; import net.minecraft.server.v1_5_R2.IInventory; +import net.minecraft.server.v1_5_R2.PlayerInventory; public class SilentContainerChest extends ContainerChest { public IInventory inv; @@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest { } @Override - public void b(EntityHuman paramEntityHuman) { + public void b(EntityHuman entityHuman) { // Don't send close signal twice, might screw up + PlayerInventory playerinventory = entityHuman.inventory; + + if (playerinventory.getCarried() != null) { + entityHuman.drop(playerinventory.getCarried()); + playerinventory.setCarried(null); + } } } diff --git a/src/main/java/com/lishid/openinv/internal/v1_5_R3/SilentContainerChest.java b/src/main/java/com/lishid/openinv/internal/v1_5_R3/SilentContainerChest.java index 177c4f5..3ba6a4e 100644 --- a/src/main/java/com/lishid/openinv/internal/v1_5_R3/SilentContainerChest.java +++ b/src/main/java/com/lishid/openinv/internal/v1_5_R3/SilentContainerChest.java @@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_5_R3; import net.minecraft.server.v1_5_R3.ContainerChest; import net.minecraft.server.v1_5_R3.EntityHuman; import net.minecraft.server.v1_5_R3.IInventory; +import net.minecraft.server.v1_5_R3.PlayerInventory; public class SilentContainerChest extends ContainerChest { public IInventory inv; @@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest { } @Override - public void b(EntityHuman paramEntityHuman) { + public void b(EntityHuman entityHuman) { // Don't send close signal twice, might screw up + PlayerInventory playerinventory = entityHuman.inventory; + + if (playerinventory.getCarried() != null) { + entityHuman.drop(playerinventory.getCarried()); + playerinventory.setCarried(null); + } } } diff --git a/src/main/java/com/lishid/openinv/internal/v1_6_R1/SilentContainerChest.java b/src/main/java/com/lishid/openinv/internal/v1_6_R1/SilentContainerChest.java index 6373bee..9ae783d 100644 --- a/src/main/java/com/lishid/openinv/internal/v1_6_R1/SilentContainerChest.java +++ b/src/main/java/com/lishid/openinv/internal/v1_6_R1/SilentContainerChest.java @@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_6_R1; import net.minecraft.server.v1_6_R1.ContainerChest; import net.minecraft.server.v1_6_R1.EntityHuman; import net.minecraft.server.v1_6_R1.IInventory; +import net.minecraft.server.v1_6_R1.PlayerInventory; public class SilentContainerChest extends ContainerChest { public IInventory inv; @@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest { } @Override - public void b(EntityHuman paramEntityHuman) { + public void b(EntityHuman entityHuman) { // Don't send close signal twice, might screw up + PlayerInventory playerinventory = entityHuman.inventory; + + if (playerinventory.getCarried() != null) { + entityHuman.drop(playerinventory.getCarried()); + playerinventory.setCarried(null); + } } } diff --git a/src/main/java/com/lishid/openinv/internal/v1_6_R2/SilentContainerChest.java b/src/main/java/com/lishid/openinv/internal/v1_6_R2/SilentContainerChest.java index 82b2525..3c2e2b3 100644 --- a/src/main/java/com/lishid/openinv/internal/v1_6_R2/SilentContainerChest.java +++ b/src/main/java/com/lishid/openinv/internal/v1_6_R2/SilentContainerChest.java @@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_6_R2; import net.minecraft.server.v1_6_R2.ContainerChest; import net.minecraft.server.v1_6_R2.EntityHuman; import net.minecraft.server.v1_6_R2.IInventory; +import net.minecraft.server.v1_6_R2.PlayerInventory; public class SilentContainerChest extends ContainerChest { public IInventory inv; @@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest { } @Override - public void b(EntityHuman paramEntityHuman) { + public void b(EntityHuman entityHuman) { // Don't send close signal twice, might screw up + PlayerInventory playerinventory = entityHuman.inventory; + + if (playerinventory.getCarried() != null) { + entityHuman.drop(playerinventory.getCarried()); + playerinventory.setCarried(null); + } } } diff --git a/src/main/java/com/lishid/openinv/internal/v1_6_R3/SilentContainerChest.java b/src/main/java/com/lishid/openinv/internal/v1_6_R3/SilentContainerChest.java index bf2f213..65398a2 100644 --- a/src/main/java/com/lishid/openinv/internal/v1_6_R3/SilentContainerChest.java +++ b/src/main/java/com/lishid/openinv/internal/v1_6_R3/SilentContainerChest.java @@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_6_R3; import net.minecraft.server.v1_6_R3.ContainerChest; import net.minecraft.server.v1_6_R3.EntityHuman; import net.minecraft.server.v1_6_R3.IInventory; +import net.minecraft.server.v1_6_R3.PlayerInventory; public class SilentContainerChest extends ContainerChest { public IInventory inv; @@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest { } @Override - public void b(EntityHuman paramEntityHuman) { + public void b(EntityHuman entityHuman) { // Don't send close signal twice, might screw up + PlayerInventory playerinventory = entityHuman.inventory; + + if (playerinventory.getCarried() != null) { + entityHuman.drop(playerinventory.getCarried()); + playerinventory.setCarried(null); + } } } diff --git a/src/main/java/com/lishid/openinv/internal/v1_7_R1/SilentContainerChest.java b/src/main/java/com/lishid/openinv/internal/v1_7_R1/SilentContainerChest.java index 3541d1b..44209df 100644 --- a/src/main/java/com/lishid/openinv/internal/v1_7_R1/SilentContainerChest.java +++ b/src/main/java/com/lishid/openinv/internal/v1_7_R1/SilentContainerChest.java @@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_7_R1; import net.minecraft.server.v1_7_R1.ContainerChest; import net.minecraft.server.v1_7_R1.EntityHuman; import net.minecraft.server.v1_7_R1.IInventory; +import net.minecraft.server.v1_7_R1.PlayerInventory; public class SilentContainerChest extends ContainerChest { public IInventory inv; @@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest { } @Override - public void b(EntityHuman paramEntityHuman) { + public void b(EntityHuman entityHuman) { // Don't send close signal twice, might screw up + PlayerInventory playerinventory = entityHuman.inventory; + + if (playerinventory.getCarried() != null) { + entityHuman.drop(playerinventory.getCarried(), false); + playerinventory.setCarried(null); + } } } diff --git a/src/main/java/com/lishid/openinv/internal/v1_7_R2/SilentContainerChest.java b/src/main/java/com/lishid/openinv/internal/v1_7_R2/SilentContainerChest.java index e0a459c..89dd42c 100644 --- a/src/main/java/com/lishid/openinv/internal/v1_7_R2/SilentContainerChest.java +++ b/src/main/java/com/lishid/openinv/internal/v1_7_R2/SilentContainerChest.java @@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_7_R2; import net.minecraft.server.v1_7_R2.ContainerChest; import net.minecraft.server.v1_7_R2.EntityHuman; import net.minecraft.server.v1_7_R2.IInventory; +import net.minecraft.server.v1_7_R2.PlayerInventory; public class SilentContainerChest extends ContainerChest { public IInventory inv; @@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest { } @Override - public void b(EntityHuman paramEntityHuman) { + public void b(EntityHuman entityHuman) { // Don't send close signal twice, might screw up + PlayerInventory playerinventory = entityHuman.inventory; + + if (playerinventory.getCarried() != null) { + entityHuman.drop(playerinventory.getCarried(), false); + playerinventory.setCarried(null); + } } } diff --git a/src/main/java/com/lishid/openinv/internal/v1_7_R3/SilentContainerChest.java b/src/main/java/com/lishid/openinv/internal/v1_7_R3/SilentContainerChest.java index ff2c49a..38e06d9 100644 --- a/src/main/java/com/lishid/openinv/internal/v1_7_R3/SilentContainerChest.java +++ b/src/main/java/com/lishid/openinv/internal/v1_7_R3/SilentContainerChest.java @@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_7_R3; import net.minecraft.server.v1_7_R3.ContainerChest; import net.minecraft.server.v1_7_R3.EntityHuman; import net.minecraft.server.v1_7_R3.IInventory; +import net.minecraft.server.v1_7_R3.PlayerInventory; public class SilentContainerChest extends ContainerChest { public IInventory inv; @@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest { } @Override - public void b(EntityHuman paramEntityHuman) { + public void b(EntityHuman entityHuman) { // Don't send close signal twice, might screw up + PlayerInventory playerinventory = entityHuman.inventory; + + if (playerinventory.getCarried() != null) { + entityHuman.drop(playerinventory.getCarried(), false); + playerinventory.setCarried(null); + } } } diff --git a/src/main/java/com/lishid/openinv/internal/v1_7_R4/SilentContainerChest.java b/src/main/java/com/lishid/openinv/internal/v1_7_R4/SilentContainerChest.java index 6cf1d5c..a5abded 100644 --- a/src/main/java/com/lishid/openinv/internal/v1_7_R4/SilentContainerChest.java +++ b/src/main/java/com/lishid/openinv/internal/v1_7_R4/SilentContainerChest.java @@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_7_R4; import net.minecraft.server.v1_7_R4.ContainerChest; import net.minecraft.server.v1_7_R4.EntityHuman; import net.minecraft.server.v1_7_R4.IInventory; +import net.minecraft.server.v1_7_R4.PlayerInventory; public class SilentContainerChest extends ContainerChest { public IInventory inv; @@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest { } @Override - public void b(EntityHuman paramEntityHuman) { + public void b(EntityHuman entityHuman) { // Don't send close signal twice, might screw up + PlayerInventory playerinventory = entityHuman.inventory; + + if (playerinventory.getCarried() != null) { + entityHuman.drop(playerinventory.getCarried(), false); + playerinventory.setCarried(null); + } } } diff --git a/src/main/java/com/lishid/openinv/internal/v1_8_R1/SilentContainerChest.java b/src/main/java/com/lishid/openinv/internal/v1_8_R1/SilentContainerChest.java index e26b3a3..03f1a0a 100644 --- a/src/main/java/com/lishid/openinv/internal/v1_8_R1/SilentContainerChest.java +++ b/src/main/java/com/lishid/openinv/internal/v1_8_R1/SilentContainerChest.java @@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_8_R1; import net.minecraft.server.v1_8_R1.ContainerChest; import net.minecraft.server.v1_8_R1.EntityHuman; import net.minecraft.server.v1_8_R1.IInventory; +import net.minecraft.server.v1_8_R1.PlayerInventory; public class SilentContainerChest extends ContainerChest { public IInventory inv; @@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest { } @Override - public void b(EntityHuman paramEntityHuman) { + public void b(EntityHuman entityHuman) { // Don't send close signal twice, might screw up + PlayerInventory playerinventory = entityHuman.inventory; + + if (playerinventory.getCarried() != null) { + entityHuman.drop(playerinventory.getCarried(), false); + playerinventory.setCarried(null); + } } } diff --git a/src/main/java/com/lishid/openinv/internal/v1_8_R2/SilentContainerChest.java b/src/main/java/com/lishid/openinv/internal/v1_8_R2/SilentContainerChest.java index 8ee6f79..0a3dac3 100644 --- a/src/main/java/com/lishid/openinv/internal/v1_8_R2/SilentContainerChest.java +++ b/src/main/java/com/lishid/openinv/internal/v1_8_R2/SilentContainerChest.java @@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_8_R2; import net.minecraft.server.v1_8_R2.ContainerChest; import net.minecraft.server.v1_8_R2.EntityHuman; import net.minecraft.server.v1_8_R2.IInventory; +import net.minecraft.server.v1_8_R2.PlayerInventory; public class SilentContainerChest extends ContainerChest { public IInventory inv; @@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest { } @Override - public void b(EntityHuman paramEntityHuman) { + public void b(EntityHuman entityHuman) { // Don't send close signal twice, might screw up + PlayerInventory playerinventory = entityHuman.inventory; + + if (playerinventory.getCarried() != null) { + entityHuman.drop(playerinventory.getCarried(), false); + playerinventory.setCarried(null); + } } } diff --git a/src/main/java/com/lishid/openinv/internal/v1_8_R3/SilentContainerChest.java b/src/main/java/com/lishid/openinv/internal/v1_8_R3/SilentContainerChest.java index 0a7602c..64a5f68 100644 --- a/src/main/java/com/lishid/openinv/internal/v1_8_R3/SilentContainerChest.java +++ b/src/main/java/com/lishid/openinv/internal/v1_8_R3/SilentContainerChest.java @@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_8_R3; import net.minecraft.server.v1_8_R3.ContainerChest; import net.minecraft.server.v1_8_R3.EntityHuman; import net.minecraft.server.v1_8_R3.IInventory; +import net.minecraft.server.v1_8_R3.PlayerInventory; public class SilentContainerChest extends ContainerChest { public IInventory inv; @@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest { } @Override - public void b(EntityHuman paramEntityHuman) { + public void b(EntityHuman entityHuman) { // Don't send close signal twice, might screw up + PlayerInventory playerinventory = entityHuman.inventory; + + if (playerinventory.getCarried() != null) { + entityHuman.drop(playerinventory.getCarried(), false); + playerinventory.setCarried(null); + } } } diff --git a/src/main/java/com/lishid/openinv/internal/v1_9_R1/SilentContainerChest.java b/src/main/java/com/lishid/openinv/internal/v1_9_R1/SilentContainerChest.java index 6453bc2..f290821 100644 --- a/src/main/java/com/lishid/openinv/internal/v1_9_R1/SilentContainerChest.java +++ b/src/main/java/com/lishid/openinv/internal/v1_9_R1/SilentContainerChest.java @@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_9_R1; import net.minecraft.server.v1_9_R1.ContainerChest; import net.minecraft.server.v1_9_R1.EntityHuman; import net.minecraft.server.v1_9_R1.IInventory; +import net.minecraft.server.v1_9_R1.PlayerInventory; public class SilentContainerChest extends ContainerChest { public IInventory inv; @@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest { } @Override - public void b(EntityHuman paramEntityHuman) { + public void b(EntityHuman entityHuman) { // Don't send close signal twice, might screw up + PlayerInventory playerinventory = entityHuman.inventory; + + if (playerinventory.getCarried() != null) { + entityHuman.drop(playerinventory.getCarried(), false); + playerinventory.setCarried(null); + } } } diff --git a/src/main/java/com/lishid/openinv/internal/v1_9_R2/SilentContainerChest.java b/src/main/java/com/lishid/openinv/internal/v1_9_R2/SilentContainerChest.java index e8c5d1c..1bb4d97 100644 --- a/src/main/java/com/lishid/openinv/internal/v1_9_R2/SilentContainerChest.java +++ b/src/main/java/com/lishid/openinv/internal/v1_9_R2/SilentContainerChest.java @@ -20,6 +20,7 @@ package com.lishid.openinv.internal.v1_9_R2; import net.minecraft.server.v1_9_R2.ContainerChest; import net.minecraft.server.v1_9_R2.EntityHuman; import net.minecraft.server.v1_9_R2.IInventory; +import net.minecraft.server.v1_9_R2.PlayerInventory; public class SilentContainerChest extends ContainerChest { public IInventory inv; @@ -32,7 +33,13 @@ public class SilentContainerChest extends ContainerChest { } @Override - public void b(EntityHuman paramEntityHuman) { + public void b(EntityHuman entityHuman) { // Don't send close signal twice, might screw up + PlayerInventory playerinventory = entityHuman.inventory; + + if (playerinventory.getCarried() != null) { + entityHuman.drop(playerinventory.getCarried(), false); + playerinventory.setCarried(null); + } } } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 82f04fa..1a3581b 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: OpenInv main: com.lishid.openinv.OpenInv -version: 2.4.6 +version: 2.4.7 author: lishid authors: [Jikoo] description: >