From 64e33f234d1e2d8d3703287530098ca03b59c58e Mon Sep 17 00:00:00 2001 From: fullwall Date: Mon, 21 Oct 2013 00:38:51 +0800 Subject: [PATCH] Change EnderCrystalMarker to use endersignals instead --- ...alMarker.java => EntityEnderSignalMarker.java} | 15 +++++++-------- .../trait/waypoint/WaypointMarkers.java | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) rename src/main/java/net/citizensnpcs/trait/waypoint/{EntityEnderCrystalMarker.java => EntityEnderSignalMarker.java} (53%) diff --git a/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderCrystalMarker.java b/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderSignalMarker.java similarity index 53% rename from src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderCrystalMarker.java rename to src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderSignalMarker.java index 0ceabf934..cbdaf89e9 100644 --- a/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderCrystalMarker.java +++ b/src/main/java/net/citizensnpcs/trait/waypoint/EntityEnderSignalMarker.java @@ -1,24 +1,23 @@ package net.citizensnpcs.trait.waypoint; import net.minecraft.server.v1_6_R3.DamageSource; -import net.minecraft.server.v1_6_R3.EntityEnderCrystal; +import net.minecraft.server.v1_6_R3.EntityEnderSignal; import net.minecraft.server.v1_6_R3.World; -public class EntityEnderCrystalMarker extends EntityEnderCrystal { - public EntityEnderCrystalMarker(World world) { +public class EntityEnderSignalMarker extends EntityEnderSignal { + public EntityEnderSignalMarker(World world) { super(world); } + public EntityEnderSignalMarker(World world, double d0, double d1, double d2) { + super(world, d0, d1, d2); + } + @Override public boolean damageEntity(DamageSource damagesource, float i) { return false; } - @Override - public boolean L() { - return false; - } - @Override public void l_() { } diff --git a/src/main/java/net/citizensnpcs/trait/waypoint/WaypointMarkers.java b/src/main/java/net/citizensnpcs/trait/waypoint/WaypointMarkers.java index 962daa714..2fdd66aef 100644 --- a/src/main/java/net/citizensnpcs/trait/waypoint/WaypointMarkers.java +++ b/src/main/java/net/citizensnpcs/trait/waypoint/WaypointMarkers.java @@ -41,6 +41,6 @@ public class WaypointMarkers { } public Entity spawnMarker(World world, Location at) { - return NMS.spawnCustomEntity(world, at, EntityEnderCrystalMarker.class, EntityType.ENDER_CRYSTAL); + return NMS.spawnCustomEntity(world, at, EntityEnderSignalMarker.class, EntityType.ENDER_SIGNAL); } } \ No newline at end of file