UPDATE 1.6.4 -Spleef Listeners fix

Bug de Listerners corrigido novamente

ChangeLog.txt

@@ -1,5 +1,10 @@
 ChangeLog HEventosReloaded
 
+HEventos ChangeLog version=1.6.4
+
+14/09/2017
+Bug de Listerners corrigido novamente
+
 HEventos ChangeLog version=1.6.3
 
 11/09/2017

plugin.yml

@@ -1,6 +1,6 @@
 main: me.herobrinedobem.heventos.HEventos
 name: HEventosReloaded
-version: 1.6.3
+version: 1.6.4
 author: GabrielDev
 description: Plugin de eventos automaticos
 

src/me/herobrinedobem/heventos/HEventos.java

@@ -29,7 +29,7 @@
  * 
  * @author Herobrinedobem (Gabriel Henrique)
  * @author GabrielDev (DeathRush)
- * @version 1.6.3
+ * @version 1.6.4
  */
 public class HEventos extends JavaPlugin {
 

src/me/herobrinedobem/heventos/eventos/Spleef.java

@@ -83,15 +83,9 @@ public void scheduledMethod() {
 			}
 		}
 		if (getParticipantes().size() == 1) {
-			Player player = null;
-			for (Player p : getParticipantes()) {
-				player = p;
-			}
+			Player player = getParticipantes().get(0);
 			PlayerWinEvent event = new PlayerWinEvent(player, this, false);
 			HEventos.getHEventos().getServer().getPluginManager().callEvent(event);
-			for (Block b : cubo.getBlocks()) {
-				b.setType(Material.getMaterial(7));
-			}
 			stopEvent();
 		}
 	}

src/me/herobrinedobem/heventos/eventos/listeners/BatataQuenteListener.java

@@ -18,7 +18,7 @@ public class BatataQuenteListener extends EventoBaseListener {
 	private EventoBaseAPI evento;
 
 	@EventHandler
-	public void onPlayerInteractEvent(PlayerInteractEntityEvent e) {
+	public void onPlayerInteractEventBQUENTE(PlayerInteractEntityEvent e) {
 		evento = HEventos.getHEventos().getEventosController().getEvento();
 		if (evento == null)
 			return;
@@ -44,7 +44,7 @@ public void onPlayerInteractEvent(PlayerInteractEntityEvent e) {
 	}
 
 	@EventHandler
-	public void onInventoryClickEvent(InventoryClickEvent e) {
+	public void onInventoryClickEventBQUENTE(InventoryClickEvent e) {
 		evento = HEventos.getHEventos().getEventosController().getEvento();
 		if (evento == null)
 			return;
@@ -56,7 +56,7 @@ public void onInventoryClickEvent(InventoryClickEvent e) {
 	}
 
 	@EventHandler
-	public void onPlayerDropItem(PlayerDropItemEvent a) {
+	public void onPlayerDropItemBQUENTE(PlayerDropItemEvent a) {
 		evento = HEventos.getHEventos().getEventosController().getEvento();
 		if (evento == null)
 			return;

src/me/herobrinedobem/heventos/eventos/listeners/BowSpleefListener.java

@@ -15,7 +15,7 @@ public class BowSpleefListener extends EventoBaseListener {
 	private EventoBaseAPI evento;
 
 	@EventHandler
-	public void onPlayerMoveEvent(PlayerMoveEvent e) {
+	public void onPlayerMoveEventBSPLEEF(PlayerMoveEvent e) {
 		evento = HEventos.getHEventos().getEventosController().getEvento();
 		if (evento == null)
 			return;

src/me/herobrinedobem/heventos/eventos/listeners/EventoNormalListener.java

@@ -16,7 +16,7 @@ public class EventoNormalListener extends EventoBaseListener {
 	private EventoBaseAPI evento;
 
 	@EventHandler
-	public void onPlayerInteractEvent(PlayerInteractEvent e) {
+	public void onPlayerInteractEventNORMAL(PlayerInteractEvent e) {
 		evento = HEventos.getHEventos().getEventosController().getEvento();
 		if (evento == null)
 			return;

src/me/herobrinedobem/heventos/eventos/listeners/FrogListener.java

@@ -17,7 +17,7 @@ public class FrogListener extends EventoBaseListener {
 	private EventoBaseAPI evento;
 
 	@EventHandler
-	public void onPlayerMoveEvent(PlayerMoveEvent e) {
+	public void onPlayerMoveEventFROG(PlayerMoveEvent e) {
 		evento = HEventos.getHEventos().getEventosController().getEvento();
 		if (evento == null)
 			return;

src/me/herobrinedobem/heventos/eventos/listeners/KillerListener.java

@@ -17,7 +17,7 @@ public class KillerListener extends EventoBaseListener {
 	EventoBaseAPI evento;
 
 	@EventHandler
-	public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent e) {
+	public void onEntityDamageByEntityEventKILLER(EntityDamageByEntityEvent e) {
 		evento = HEventos.getHEventos().getEventosController().getEvento();
 		if (evento == null)
 			return;
@@ -52,7 +52,7 @@ public void onPlayerQuitEventKILLER(PlayerQuitEvent e) {
 	}
 
 	@EventHandler
-	public void onPotionSplashEvent(PotionSplashEvent e) {
+	public void onPotionSplashEventKILLER(PotionSplashEvent e) {
 		evento = HEventos.getHEventos().getEventosController().getEvento();
 		if (evento != null) {
 			if (e.getPotion().getShooter() instanceof Player) {

src/me/herobrinedobem/heventos/eventos/listeners/MinaMortalListener.java

@@ -13,7 +13,7 @@ public class MinaMortalListener extends EventoBaseListener {
 	private EventoBaseAPI evento;
 
 	@EventHandler
-	public void onPotionSplashEvent(PotionSplashEvent e) {
+	public void onPotionSplashEventMINA(PotionSplashEvent e) {
 		evento = HEventos.getHEventos().getEventosController().getEvento();
 		if (evento != null) {
 			if (e.getPotion().getShooter() instanceof Player) {

src/me/herobrinedobem/heventos/eventos/listeners/PaintballListener.java

@@ -18,7 +18,7 @@ public class PaintballListener extends EventoBaseListener {
 	private EventoBaseAPI evento;
 
 	@EventHandler
-	public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent e) {
+	public void onEntityDamageByEntityEventPAINTBALL(EntityDamageByEntityEvent e) {
 		evento = HEventos.getHEventos().getEventosController().getEvento();
 		if (evento == null)
 			return;
@@ -69,7 +69,7 @@ public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent e) {
 	}
 
 	@EventHandler
-	public void onPlayerLoseEvent(PlayerLoseEvent e) {
+	public void onPlayerLoseEventPAINTBALL(PlayerLoseEvent e) {
 		evento = HEventos.getHEventos().getEventosController().getEvento();
 		Paintball paintball = (Paintball) evento;
 		if (paintball.getTimeVermelho().contains(e.getPlayer())) {
@@ -85,7 +85,7 @@ public void onPlayerLoseEvent(PlayerLoseEvent e) {
 	}
 
 	@EventHandler
-	public void onInventoryClickEvent(InventoryClickEvent e) {
+	public void onInventoryClickEventPAINTBALL(InventoryClickEvent e) {
 		evento = HEventos.getHEventos().getEventosController().getEvento();
 		if (evento == null)
 			return;
@@ -96,7 +96,7 @@ public void onInventoryClickEvent(InventoryClickEvent e) {
 		e.setCancelled(true);
 	}
 
-	public void eliminar(Paintball paintball, Player atirou, Player atingido) {
+	private void eliminar(Paintball paintball, Player atirou, Player atingido) {
 		evento = HEventos.getHEventos().getEventosController().getEvento();
 		atingido.setHealth(20.0);
 		PlayerLoseEvent event = new PlayerLoseEvent(atingido, evento);

src/me/herobrinedobem/heventos/eventos/listeners/SemaforoListener.java

@@ -20,7 +20,7 @@ public class SemaforoListener extends EventoBaseListener {
 	private EventoBaseAPI evento;
 
 	@EventHandler
-	public void onPlayerInteractEvent(PlayerInteractEvent e) {
+	public void onPlayerInteractEventSEMAFORO(PlayerInteractEvent e) {
 		evento = HEventos.getHEventos().getEventosController().getEvento();
 		if (evento == null)
 			return;
@@ -47,7 +47,7 @@ public void onPlayerInteractEvent(PlayerInteractEvent e) {
 	}
 
 	@EventHandler
-	public void onPlayerMoveEvent(PlayerMoveEvent e) {
+	public void onPlayerMoveEventSEMAFORO(PlayerMoveEvent e) {
 		evento = HEventos.getHEventos().getEventosController().getEvento();
 		if (evento == null)
 			return;

src/me/herobrinedobem/heventos/eventos/listeners/SpleefListener.java

@@ -8,6 +8,7 @@
 import me.herobrinedobem.heventos.HEventos;
 import me.herobrinedobem.heventos.api.EventoBaseAPI;
 import me.herobrinedobem.heventos.api.EventoBaseListener;
+import me.herobrinedobem.heventos.api.EventoType;
 import me.herobrinedobem.heventos.api.events.PlayerLoseEvent;
 import me.herobrinedobem.heventos.eventos.Spleef;
 
@@ -16,7 +17,7 @@ public class SpleefListener extends EventoBaseListener {
 	private EventoBaseAPI evento;
 
 	@EventHandler
-	public void onBlockBreakEvento(BlockBreakEvent e) {
+	public void onBlockBreakEventoSPLEEF(BlockBreakEvent e) {
 		evento = HEventos.getHEventos().getEventosController().getEvento();
 		if (evento == null)
 			return;
@@ -33,13 +34,15 @@ public void onBlockBreakEvento(BlockBreakEvent e) {
 	}
 
 	@EventHandler
-	public void onPlayerMoveEvent(PlayerMoveEvent e) {
+	public void onPlayerMoveEventSPLEEF(PlayerMoveEvent e) {
 		evento = HEventos.getHEventos().getEventosController().getEvento();
 		if (evento == null)
 			return;
+		if (evento.getEventoType() == EventoType.SPLEEF)
+			return;
 		if (!evento.getParticipantes().contains(e.getPlayer()))
 			return;
-		if ((evento.isAberto()))
+		if (evento.isAberto())
 			return;
 		if (!evento.isOcorrendo())
 			return;

src/me/herobrinedobem/heventos/utils/BukkitEventHelper.java

@@ -18,9 +18,9 @@ public static void unregisterEvents(Listener listener, Plugin plugin) {
 				if (method.getAnnotation(EventHandler.class) != null) {
 					BukkitEventHelper.unregisterEvent((Class<? extends Event>) method.getParameterTypes()[0], listener, plugin);
 				}
-
 			}
 		} catch (Exception e) {
+			e.printStackTrace();
 		}
 	}
 
@@ -30,6 +30,7 @@ public static void unregisterEvent(Class<? extends Event> eventClass, Listener l
 				try {
 					((HandlerList) eventClass.getMethod("getHandlerList").invoke(null)).unregister(regListener);
 				} catch (Exception e) {
+					e.printStackTrace();
 				}
 			}
 		}