Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 21:19:00 +01:00
Code Issues Projects Releases Wiki Activity

Implement displayblocks for minecarts (SPIGOT-14).

Browse Source
This commit is contained in:
FearThe1337 2014-12-10 14:41:54 +01:00 committed by md_5
parent fe8d20e376
commit c13e6e69a2
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
View File

@ -1,9 +1,14 @@
package org.bukkit.craftbukkit.entity; package org.bukkit.craftbukkit.entity;
import net.minecraft.server.Blocks;
import net.minecraft.server.EntityMinecartAbstract; import net.minecraft.server.EntityMinecartAbstract;
import net.minecraft.server.IBlockData;
import org.bukkit.Material;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.util.CraftMagicNumbers;
import org.bukkit.entity.Minecart; import org.bukkit.entity.Minecart;
import org.bukkit.material.MaterialData;
import org.bukkit.util.NumberConversions; import org.bukkit.util.NumberConversions;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@ -68,4 +73,28 @@ public abstract class CraftMinecart extends CraftVehicle implements Minecart {
public int _INVALID_getDamage() { public int _INVALID_getDamage() {
return NumberConversions.ceil(getDamage()); return NumberConversions.ceil(getDamage());
} }
public void setDisplayBlock(MaterialData material) {
if(material != null) {
IBlockData block = CraftMagicNumbers.getBlock(material.getItemTypeId()).fromLegacyData(material.getData());
this.getHandle().a(block);
} else {
// Set block to air (default) and set the flag to not have a display block.
this.getHandle().a(Blocks.AIR.getBlockData());
this.getHandle().a(false);
}
}
public MaterialData getDisplayBlock() {
IBlockData blockData = getHandle().t(); // PAIL: Rename
return CraftMagicNumbers.getMaterial(blockData.getBlock()).getNewData((byte) blockData.getBlock().toLegacyData(blockData));
}
public void setDisplayBlockOffset(int offset) {
getHandle().l(offset); // PAIL: Rename
}
public int getDisplayBlockOffset() {
return getHandle().v(); // PAIL: Rename
}
} }