TotalFreedomMC/OpenInv
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/OpenInv.git synced 2024-12-23 00:15:08 +00:00
Code Issues Projects Releases Wiki Activity

Correct unnecessary AnyContainer usage

Browse source
This commit is contained in:
Jikoo 2018-08-26 14:37:29 -04:00
parent 6bff759d72
commit c22e18c096
1 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
internal/v1_13_R1/src/main/java/com/lishid/openinv/internal/v1_13_R1/AnySilentContainer.java
View file

@ -16,26 +16,16 @@
package com.lishid.openinv.internal.v1_13_R1; package com.lishid.openinv.internal.v1_13_R1;
import java.lang.reflect.Field;
import com.lishid.openinv.internal.IAnySilentContainer; import com.lishid.openinv.internal.IAnySilentContainer;
import net.minecraft.server.v1_13_R1.BlockChestTrapped;
import net.minecraft.server.v1_13_R1.BlockPropertyChestType;
import net.minecraft.server.v1_13_R1.ChatMessage;
import net.minecraft.server.v1_13_R1.VoxelShapes;
import org.bukkit.Material;
import org.bukkit.Statistic;
import org.bukkit.block.BlockState;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import net.minecraft.server.v1_13_R1.AxisAlignedBB; import net.minecraft.server.v1_13_R1.AxisAlignedBB;
import net.minecraft.server.v1_13_R1.Block; import net.minecraft.server.v1_13_R1.Block;
import net.minecraft.server.v1_13_R1.BlockChest; import net.minecraft.server.v1_13_R1.BlockChest;
import net.minecraft.server.v1_13_R1.BlockChestTrapped;
import net.minecraft.server.v1_13_R1.BlockEnderChest; import net.minecraft.server.v1_13_R1.BlockEnderChest;
import net.minecraft.server.v1_13_R1.BlockPosition; import net.minecraft.server.v1_13_R1.BlockPosition;
import net.minecraft.server.v1_13_R1.BlockPropertyChestType;
import net.minecraft.server.v1_13_R1.BlockShulkerBox; import net.minecraft.server.v1_13_R1.BlockShulkerBox;
import net.minecraft.server.v1_13_R1.ChatMessage;
import net.minecraft.server.v1_13_R1.Entity; import net.minecraft.server.v1_13_R1.Entity;
import net.minecraft.server.v1_13_R1.EntityOcelot; import net.minecraft.server.v1_13_R1.EntityOcelot;
import net.minecraft.server.v1_13_R1.EntityPlayer; import net.minecraft.server.v1_13_R1.EntityPlayer;
@ -50,7 +40,15 @@ import net.minecraft.server.v1_13_R1.TileEntity;
import net.minecraft.server.v1_13_R1.TileEntityChest; import net.minecraft.server.v1_13_R1.TileEntityChest;
import net.minecraft.server.v1_13_R1.TileEntityEnderChest; import net.minecraft.server.v1_13_R1.TileEntityEnderChest;
import net.minecraft.server.v1_13_R1.TileEntityShulkerBox; import net.minecraft.server.v1_13_R1.TileEntityShulkerBox;
import net.minecraft.server.v1_13_R1.VoxelShapes;
import net.minecraft.server.v1_13_R1.World; import net.minecraft.server.v1_13_R1.World;
import org.bukkit.Material;
import org.bukkit.Statistic;
import org.bukkit.block.BlockState;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import java.lang.reflect.Field;
public class AnySilentContainer implements IAnySilentContainer { public class AnySilentContainer implements IAnySilentContainer {
@ -99,21 +97,23 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
// Check for matching adjacent chests that are blocked or have an ocelot on top // Check for matching adjacent chests that are blocked or have an ocelot on top
for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) { BlockPropertyChestType chestType = blockData.get(BlockChest.b);
BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
Block localBlock = world.getType(localBlockPosition).getBlock();
if (localBlock != block) { if (chestType == BlockPropertyChestType.SINGLE) {
continue; return false;
} }
TileEntity localTileEntity = world.getTileEntity(localBlockPosition); BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.k(blockData));
if (!(localTileEntity instanceof TileEntityChest)) { IBlockData adjacentBlockData = world.getType(adjacentBlockPosition);
continue;
}
if (this.isBlockedChest(world, localBlockPosition)) { if (adjacentBlockData.getBlock() == block) {
return true;
BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.b);
if (adjacentChestType != BlockPropertyChestType.SINGLE && chestType != adjacentChestType
&& adjacentBlockData.get(BlockChest.FACING) == blockData.get(BlockChest.FACING)) {
return this.isBlockedChest(world, adjacentBlockPosition);
} }
} }