Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-26 10:57:47 +01:00
Code Issues Projects Releases Wiki Activity

Implement EndGateway state

Browse Source
This commit is contained in:
Matthew 2016-03-16 20:50:55 -04:00 committed by md_5
parent 6efa87306b
commit da444904c2
3 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
View File

@ -272,6 +272,8 @@ public class CraftBlock implements Block {
return new CraftDispenser(this); return new CraftDispenser(this);
case DROPPER: case DROPPER:
return new CraftDropper(this); return new CraftDropper(this);
case END_GATEWAY:
return new CraftEndGateway(this);
case HOPPER: case HOPPER:
return new CraftHopper(this); return new CraftHopper(this);
case MOB_SPAWNER: case MOB_SPAWNER:

40
src/main/java/org/bukkit/craftbukkit/block/CraftEndGateway.java Normal file
View File

@ -0,0 +1,40 @@
package org.bukkit.craftbukkit.block;
import net.minecraft.server.TileEntityEndGateway;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.EndGateway;
import org.bukkit.craftbukkit.CraftWorld;
public class CraftEndGateway extends CraftBlockState implements EndGateway {
private TileEntityEndGateway gateway;
public CraftEndGateway(Block block) {
super(block);
CraftWorld world = (CraftWorld) block.getWorld();
gateway = (TileEntityEndGateway) world.getTileEntityAt(getX(), getY(), getZ());
}
public CraftEndGateway(final Material material, TileEntityEndGateway te) {
super(material);
this.gateway = te;
}
@Override
public boolean update(boolean force, boolean applyPhysics) {
boolean result = super.update(force, applyPhysics);
if (result) {
gateway.update();
}
return result;
}
@Override
public TileEntityEndGateway getTileEntity() {
return gateway;
}
}

10
src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
View File

@ -15,6 +15,7 @@ import net.minecraft.server.TileEntityChest;
import net.minecraft.server.TileEntityCommand; import net.minecraft.server.TileEntityCommand;
import net.minecraft.server.TileEntityDispenser; import net.minecraft.server.TileEntityDispenser;
import net.minecraft.server.TileEntityDropper; import net.minecraft.server.TileEntityDropper;
import net.minecraft.server.TileEntityEndGateway;
import net.minecraft.server.TileEntityFurnace; import net.minecraft.server.TileEntityFurnace;
import net.minecraft.server.TileEntityHopper; import net.minecraft.server.TileEntityHopper;
import net.minecraft.server.TileEntityMobSpawner; import net.minecraft.server.TileEntityMobSpawner;
@ -34,6 +35,7 @@ import org.bukkit.craftbukkit.block.CraftCommandBlock;
import org.bukkit.craftbukkit.block.CraftCreatureSpawner; import org.bukkit.craftbukkit.block.CraftCreatureSpawner;
import org.bukkit.craftbukkit.block.CraftDispenser; import org.bukkit.craftbukkit.block.CraftDispenser;
import org.bukkit.craftbukkit.block.CraftDropper; import org.bukkit.craftbukkit.block.CraftDropper;
import org.bukkit.craftbukkit.block.CraftEndGateway;
import org.bukkit.craftbukkit.block.CraftFurnace; import org.bukkit.craftbukkit.block.CraftFurnace;
import org.bukkit.craftbukkit.block.CraftHopper; import org.bukkit.craftbukkit.block.CraftHopper;
import org.bukkit.craftbukkit.block.CraftJukebox; import org.bukkit.craftbukkit.block.CraftJukebox;
@ -222,6 +224,11 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
te = new TileEntityDispenser(); te = new TileEntityDispenser();
} }
return new CraftDropper(material, (TileEntityDropper) te); return new CraftDropper(material, (TileEntityDropper) te);
case END_GATEWAY:
if (te == null) {
te = new TileEntityEndGateway();
}
return new CraftEndGateway(material, (TileEntityEndGateway) te);
case HOPPER: case HOPPER:
if (te == null) { if (te == null) {
te = new TileEntityHopper(); te = new TileEntityHopper();
@ -304,6 +311,9 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
case DROPPER: case DROPPER:
valid = te instanceof TileEntityDropper; valid = te instanceof TileEntityDropper;
break; break;
case END_GATEWAY:
valid = te instanceof TileEntityEndGateway;
break;
case HOPPER: case HOPPER:
valid = te instanceof TileEntityHopper; valid = te instanceof TileEntityHopper;
break; break;