Minor Bug Fixes

Fixed Minor Bugs including
- Admin Teleports
- Glass Stepping not being able to be Won
- HoneyComb now Ends if everybody dies
- Prevent Players from Hitting each other

Co-Authored-By: 1withspaghetti <79611123+1withspaghetti@users.noreply.github.com>
Co-Authored-By: Crxzy <92764280+Crxzyman@users.noreply.github.com>

Author: 3 people

src/com/overloup/squidgame/game/GlassStepping.java

@@ -12,8 +12,6 @@
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
 
 import com.overloup.squidgame.Main;
 import com.overloup.squidgame.data.GameManager;
@@ -97,6 +95,7 @@ public static void Setup() {
 		Main.frontman.sendMessage("§aGame finished Setup");
 		Main.frontman.sendMessage("§bWhen you are Ready Click the Green Concrete");
 		Main.frontman.sendMessage("§7----------------------------");
+		Main.frontman.teleport(loc);
 	}
 
 	public static void StartGame() {
@@ -138,6 +137,11 @@ public static void PlayerMove(PlayerMoveEvent event) {
 				player.playSound(p.getLocation(), Sound.BLOCK_GLASS_BREAK, 2, 1);
 			}
 		}
+
+		if (b.getRelative(BlockFace.DOWN).getType().equals(Material.RED_CONCRETE)) {
+			players.remove(p);
+			Bukkit.broadcastMessage("§e" + p.getName() + " §aPassed! §7They can Proceed to the Final Game");
+		}
 	}
 
 	public static void onPlayerDeath(PlayerDeathEvent event) {
@@ -163,7 +167,6 @@ public static void endGame() {
 
 		if (Main.participants.isEmpty()) {
 			Main.frontman.sendMessage("§aSquid Game Ended. §7No one won :(");
-			return;
 		}
 
 		for (int i = 0; i < 9; i++) {
@@ -173,6 +176,8 @@ public static void endGame() {
 		for (Player p : Main.participants) {
 			p.teleport(Main.spawn);
 		}
+
+		Main.frontman.sendMessage("§eTo Start the next Game use §a/startsquid");
 		Bukkit.getScheduler().cancelTasks(Main.plugin);
 	}
 

src/com/overloup/squidgame/game/Honeycomb.java

@@ -112,7 +112,7 @@ public static void StartGame() {
 			@Override
 			public void run() {
 				time--;
-				if (time < 0) {
+				if (time < 0 || Main.participants.isEmpty()) {
 					endGame();
 				}
 				String update = String.format("%02d:%02d", (time / 60), (time % 60));

src/com/overloup/squidgame/game/RedLightGreenLight.java

@@ -160,6 +160,7 @@ public static void PlayerMoves(PlayerMoveEvent event) {
 			Main.participants.remove(player);
 			players.remove(player);
 			Elimination.Eliminate(player);
+			Elimination.PlayShotforEveryone();
 		}
 	}
 

src/com/overloup/squidgame/listener/PlayerListener.java

@@ -9,8 +9,10 @@
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.entity.EntityCombustEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
 import org.bukkit.event.player.AsyncPlayerPreLoginEvent.Result;
 import org.bukkit.event.player.PlayerInteractEvent;
@@ -138,12 +140,14 @@ public void BlockBreak(BlockBreakEvent event) {
 			return;
 		}
 
-		event.setCancelled(true);
+		if (!event.getPlayer().isOp())
+			event.setCancelled(true);
 	}
 
 	@EventHandler
 	public void BlockPlace(BlockPlaceEvent event) {
-		event.setCancelled(true);
+		if (!event.getPlayer().isOp())
+			event.setCancelled(true);
 	}
 
 	@EventHandler
@@ -190,21 +194,31 @@ public void onPlayerMove(PlayerMoveEvent event) {
 		}
 	}
 
+	@EventHandler
 	public void onPlayerDeath(PlayerDeathEvent event) {
 		if (GameManager.getGame().equals(Game.TUGOFWAR)) {
 			TugofWar.onDeath(event);
 			return;
 		}
 	}
 
+	@EventHandler
+	public void onDamage(EntityDamageEvent event) {
+		if (event.getCause().equals(DamageCause.FALL))
+			return;
+
+		event.setCancelled(true);
+	}
+
+	@EventHandler
 	public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
 		if (event.getDamager() instanceof Player && event.getEntity() instanceof Player) {
 			if (GameManager.getGame().equals(Game.TUGOFWAR)) {
 				TugofWar.PvPAction(event);
 				return;
 			}
-			event.setCancelled(true);
 		}
+		event.setCancelled(true);
 	}
 
 }