From f08413f64248e7b0a49411d9781db8bc472ad899 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Mon, 17 Oct 2016 15:08:53 -0400 Subject: [PATCH] Updateee??? --- AliPresents.jar | Bin 44290 -> 44477 bytes plugin.yml | 2 +- src/alisolarflare/AliPresents.java | 8 +++--- .../flairdoors/PortalListener.java | 24 +++++++++++------- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/AliPresents.jar b/AliPresents.jar index 723f4ae2a37a9c60a7a87492eb8a91bf3e12d292..569ede2b5e2e208a2055e8001fa7c8c3c94ceffa 100644 GIT binary patch delta 4741 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 N-aBey<-$KX{0H&*;jI7w delta 4559 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 Y=ni052L(~Q`YWc@@e#+B{8Ov{180noHvj+t diff --git a/plugin.yml b/plugin.yml index b27b6cd..30e4a6f 100644 --- a/plugin.yml +++ b/plugin.yml @@ -9,7 +9,7 @@ commands: description: Presses an Ali Link pressalilink frequency setalilink: description: Creates an Ali Link setalilink frequency - setFlairDoorColour: + setflairdoorcolour: description: Sets the flair door colour mode, when lighting portals flairme: description: Activates the Flair Me Command. Ask Ali, she was fucking tired when writing this description \ No newline at end of file diff --git a/src/alisolarflare/AliPresents.java b/src/alisolarflare/AliPresents.java index d5a857c..35c028a 100644 --- a/src/alisolarflare/AliPresents.java +++ b/src/alisolarflare/AliPresents.java @@ -34,13 +34,13 @@ public class AliPresents extends JavaPlugin{ } public void registerSubPlugins(){ - AliLinkSubPlug alilinksubplugin = new AliLinkSubPlug(this); - alilinksubplugin.register(); + //AliLinkSubPlug alilinksubplugin = new AliLinkSubPlug(this); + //alilinksubplugin.register(); } public void registerCommands(){ - getCommand("FlairMe").setExecutor(new FlairMe()); + getCommand("flairme").setExecutor(new FlairMe()); getCommand("alishulker").setExecutor(new AliShulker()); - getCommand("SetFlairDoorColour").setExecutor(new SetFlairDoorColour()); + getCommand("setflairdoorcolour").setExecutor(new SetFlairDoorColour()); } } diff --git a/src/alisolarflare/flairdoors/PortalListener.java b/src/alisolarflare/flairdoors/PortalListener.java index bebcc49..1cbc25b 100644 --- a/src/alisolarflare/flairdoors/PortalListener.java +++ b/src/alisolarflare/flairdoors/PortalListener.java @@ -12,7 +12,8 @@ import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; -import org.bukkit.event.entity.EntityPortalEvent; +import org.bukkit.event.player.PlayerPortalEvent; +import org.bukkit.material.MaterialData; import org.bukkit.material.Wool; import alisolarflare.AliPresents; @@ -29,22 +30,23 @@ public class PortalListener implements Listener{ this.plugin = plugin; } @EventHandler - public void onPortalEnter(EntityPortalEvent event){ + public void onPortalEnter(PlayerPortalEvent event){ //SANITATION - Player - if(!(event.getEntity() instanceof Player)){ + if(!(event.getPlayer() instanceof Player)){ return; } //INIT - Player - Player player = (Player) event.getEntity(); + Player player = event.getPlayer(); + player.sendMessage("MAY THE FLAIRING COMMENCE"); //SANITATION - PlayersToBeFlaired if(!(playersToBeFlaired.contains(player.getName()))){ return; } - player.sendMessage("MAY THE FLAIRING COMMENCE"); + player.sendMessage("-MAY THE FLAIRING COMMENCE-"); player.sendMessage("Deactivating regular portal behaviour..."); - event.setCancelled(true); + event.setTo(player.getLocation()); //INIT - x,y,z int x = player.getLocation().getBlockX(); @@ -69,20 +71,24 @@ public class PortalListener implements Listener{ //TOP BLOCK IS WOOL? }else if(blockTopper.getType() == Material.WOOL){ player.sendMessage("WOOL DETECTED T"); - Wool wool = (Wool) blockTopper; + Wool wool = (Wool) blockTopper.getState().getData(); recolourPlayer(player, wool.getColor()); //MIDDLE BLOCK IS WOOL? }else if(blockMiddle.getType() == Material.WOOL){ player.sendMessage("WOOL DETECTED M"); - Wool wool = (Wool) blockMiddle; + MaterialData mData = blockMiddle.getState().getData(); + player.sendMessage("MATERIAL DATA COLLECTED: "+ mData.toString()); + Wool wool = (Wool) mData; + player.sendMessage("WOOL DATA CONVERTED: "+ wool.toString()); + recolourPlayer(player, wool.getColor()); //BOTTOM BLOCK IS WOOL? }else if (blockBottom.getType() == Material.WOOL){ player.sendMessage("WOOL DETECTED B"); - Wool wool = (Wool) blockBottom; + Wool wool = (Wool) blockBottom.getState().getData(); recolourPlayer(player, wool.getColor()); }