KnarCraft/MiniGames
KnarCraft/MiniGames
1
0
Fork 0
mirror of https://github.com/SunNetservers/MiniGames.git synced 2025-04-03 10:16:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Abuses flight mode for better in-air control

Browse Source
This commit is contained in:
Kristian Knarvik 2023-03-24 16:22:52 +01:00
parent eb67705300
commit fba75d2c3f
2 changed files with 69 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/main/java/net/knarcraft/dropper/arena/DropperArenaSession.java
View File

@ -21,6 +21,7 @@ public class DropperArenaSession {
private final @NotNull Location entryLocation; private final @NotNull Location entryLocation;
private int deaths; private int deaths;
private final long startTime; private final long startTime;
private final float playersOriginalFlySpeed;
/** /**
* Instantiates a new dropper arena session * Instantiates a new dropper arena session
@ -37,19 +38,20 @@ public class DropperArenaSession {
this.deaths = 0; this.deaths = 0;
this.startTime = System.currentTimeMillis(); this.startTime = System.currentTimeMillis();
this.entryLocation = player.getLocation(); this.entryLocation = player.getLocation();
// Prevent Spigot interference when traveling at high velocities
// Make the player fly to improve mobility in the air
player.setAllowFlight(true); player.setAllowFlight(true);
player.setFlying(true);
this.playersOriginalFlySpeed = player.getFlySpeed();
player.setFlySpeed((float) this.arena.getPlayerVelocity());
} }
/** /**
* Triggers a win for the player playing in this session * Triggers a win for the player playing in this session
*/ */
public void triggerWin() { public void triggerWin() {
// Remove this session from game sessions to stop listeners from fiddling more with the player // Stop this session
removeSession(); stopSession();
// No longer allow the player to avoid fly checks
player.setAllowFlight(false);
// Check for, and display, records // Check for, and display, records
registerRecord(); registerRecord();
@ -57,15 +59,15 @@ public class DropperArenaSession {
//TODO: Give reward? //TODO: Give reward?
// Register and announce any cleared stages // Register and announce any cleared stages
Integer arenaStage = arena.getStage(); Integer arenaStage = this.arena.getStage();
if (arenaStage != null) { if (arenaStage != null) {
boolean clearedNewStage = Dropper.getInstance().getArenaHandler().registerStageCleared(player, arenaStage); boolean clearedNewStage = Dropper.getInstance().getArenaHandler().registerStageCleared(this.player, arenaStage);
if (clearedNewStage) { if (clearedNewStage) {
player.sendMessage("You cleared stage " + arenaStage + "!"); this.player.sendMessage("You cleared stage " + arenaStage + "!");
} }
} }
player.sendMessage("You won!"); this.player.sendMessage("You won!");
// Teleport the player out of the arena // Teleport the player out of the arena
teleportToExit(); teleportToExit();
@ -77,12 +79,12 @@ public class DropperArenaSession {
private void teleportToExit() { private void teleportToExit() {
// Teleport the player out of the arena // Teleport the player out of the arena
Location exitLocation; Location exitLocation;
if (arena.getExitLocation() != null) { if (this.arena.getExitLocation() != null) {
exitLocation = arena.getExitLocation(); exitLocation = this.arena.getExitLocation();
} else { } else {
exitLocation = entryLocation; exitLocation = this.entryLocation;
} }
PlayerTeleporter.teleportPlayer(player, exitLocation, true); PlayerTeleporter.teleportPlayer(this.player, exitLocation, true);
} }
/** /**
@ -101,16 +103,16 @@ public class DropperArenaSession {
* Registers the player's record if necessary, and prints record information to the player * Registers the player's record if necessary, and prints record information to the player
*/ */
private void registerRecord() { private void registerRecord() {
DropperArenaRecordsRegistry recordsRegistry = arena.getRecordsRegistry(); DropperArenaRecordsRegistry recordsRegistry = this.arena.getRecordsRegistry();
RecordResult recordResult = switch (gameMode) { RecordResult recordResult = switch (this.gameMode) {
case LEAST_TIME -> recordsRegistry.registerTimeRecord(player, case LEAST_TIME -> recordsRegistry.registerTimeRecord(this.player,
System.currentTimeMillis() - startTime); System.currentTimeMillis() - this.startTime);
case LEAST_DEATHS -> recordsRegistry.registerDeathRecord(player, deaths); case LEAST_DEATHS -> recordsRegistry.registerDeathRecord(this.player, this.deaths);
case DEFAULT -> RecordResult.NONE; case DEFAULT -> RecordResult.NONE;
}; };
switch (recordResult) { switch (recordResult) {
case WORLD_RECORD -> player.sendMessage("You just set a new record for this arena!"); case WORLD_RECORD -> this.player.sendMessage("You just set a new record for this arena!");
case PERSONAL_BEST -> player.sendMessage("You just got a new personal record!"); case PERSONAL_BEST -> this.player.sendMessage("You just got a new personal record!");
} }
} }
@ -119,27 +121,38 @@ public class DropperArenaSession {
*/ */
public void triggerLoss() { public void triggerLoss() {
// Add to the death count if playing the least-deaths game-mode // Add to the death count if playing the least-deaths game-mode
if (gameMode == ArenaGameMode.LEAST_DEATHS) { if (this.gameMode == ArenaGameMode.LEAST_DEATHS) {
deaths++; this.deaths++;
} }
//Teleport the player back to the top //Teleport the player back to the top
PlayerTeleporter.teleportPlayer(player, arena.getSpawnLocation(), true); PlayerTeleporter.teleportPlayer(this.player, this.arena.getSpawnLocation(), true);
} }
/** /**
* Triggers a quit for the player playing in this session * Triggers a quit for the player playing in this session
*/ */
public void triggerQuit() { public void triggerQuit() {
// Remove this session from game sessions to stop listeners from fiddling more with the player // Stop this session
removeSession(); stopSession();
// No longer allow the player to avoid fly checks
player.setAllowFlight(false);
// Teleport the player out of the arena // Teleport the player out of the arena
teleportToExit(); teleportToExit();
player.sendMessage("You quit the arena!"); player.sendMessage("You quit the arena!");
} }
/**
* Stops this session, and disables flight mode
*/
private void stopSession() {
// Remove this session from game sessions to stop listeners from fiddling more with the player
removeSession();
// Remove flight mode
this.player.setFlySpeed(this.playersOriginalFlySpeed);
this.player.setFlying(false);
this.player.setAllowFlight(false);
}
/** /**
* Gets the arena this session is being played in * Gets the arena this session is being played in
* *

41
src/main/java/net/knarcraft/dropper/listener/MoveListener.java
View File

@ -19,6 +19,11 @@ public class MoveListener implements Listener {
@EventHandler @EventHandler
public void onPlayerMove(PlayerMoveEvent event) { public void onPlayerMove(PlayerMoveEvent event) {
// Ignore if no actual movement is happening
if (event.getFrom().equals(event.getTo())) {
return;
}
Player player = event.getPlayer(); Player player = event.getPlayer();
DropperArenaPlayerRegistry playerRegistry = Dropper.getInstance().getPlayerRegistry(); DropperArenaPlayerRegistry playerRegistry = Dropper.getInstance().getPlayerRegistry();
DropperArenaSession arenaSession = playerRegistry.getArenaSession(player.getUniqueId()); DropperArenaSession arenaSession = playerRegistry.getArenaSession(player.getUniqueId());
@ -26,23 +31,33 @@ public class MoveListener implements Listener {
return; return;
} }
Block targetBlock = event.getTo().getBlock(); // Prevent the player from flying upwards while in flight mode
Material targetBlockType = targetBlock.getType(); if (event.getFrom().getY() < event.getTo().getY()) {
event.setCancelled(true);
// Hitting water is the trigger for winning
if (targetBlockType == Material.WATER) {
arenaSession.triggerWin();
return; return;
} }
Location targetLocation = targetBlock.getLocation(); // Only do block type checking if the block beneath the player changes
Material beneathPlayerType = targetLocation.getWorld().getBlockAt(targetLocation.add(0, -0.1, 0)).getType(); if (event.getFrom().getBlock() != event.getTo().getBlock()) {
Block targetBlock = event.getTo().getBlock();
Material targetBlockType = targetBlock.getType();
// If hitting something which is not air or water, it must be a solid block, and would end in a loss // Hitting water is the trigger for winning
if (!targetBlockType.isAir() || (beneathPlayerType != Material.WATER && if (targetBlockType == Material.WATER) {
!beneathPlayerType.isAir())) { arenaSession.triggerWin();
arenaSession.triggerLoss(); return;
return; }
Location targetLocation = targetBlock.getLocation();
Material beneathPlayerType = targetLocation.getWorld().getBlockAt(
targetLocation.add(0, -0.1, 0)).getType();
// If hitting something which is not air or water, it must be a solid block, and would end in a loss
if (!targetBlockType.isAir() || (beneathPlayerType != Material.WATER &&
!beneathPlayerType.isAir())) {
arenaSession.triggerLoss();
return;
}
} }
//Updates the player's velocity to the one set by the arena //Updates the player's velocity to the one set by the arena