Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-26 20:55:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix ender pearl NPCs

Browse Source
This commit is contained in:
fullwall 2016-01-12 23:21:52 +08:00
parent 7259ea9832
commit dafde6c3a1
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/net/citizensnpcs/npc/entity/nonliving/EnderPearlController.java
View File

@ -1,5 +1,12 @@
package net.citizensnpcs.npc.entity.nonliving;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_8_R3.CraftServer;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEnderPearl;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
import org.bukkit.entity.EnderPearl;
import org.bukkit.util.Vector;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -7,17 +14,9 @@ import net.citizensnpcs.npc.MobEntityController;
import net.citizensnpcs.npc.ai.NPCHolder;
import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_8_R3.EntityEnderPearl;
import net.minecraft.server.v1_8_R3.EntityLiving;
import net.minecraft.server.v1_8_R3.NBTTagCompound;
import net.minecraft.server.v1_8_R3.World;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_8_R3.CraftServer;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEnderPearl;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
import org.bukkit.entity.EnderPearl;
import org.bukkit.util.Vector;
public class EnderPearlController extends MobEntityController {
public EnderPearlController() {
super(EntityEnderPearlNPC.class);
@ -46,15 +45,11 @@ public class EnderPearlController extends MobEntityController {
private final CitizensNPC npc;
public EntityEnderPearlNPC(World world) {
this(world, null, null);
this(world, null);
}
public EntityEnderPearlNPC(World world, EntityLiving living) {
this(world, living, null);
}
public EntityEnderPearlNPC(World world, EntityLiving living, NPC npc) {
super(world, null);
public EntityEnderPearlNPC(World world, NPC npc) {
super(world);
this.npc = (CitizensNPC) npc;
}