Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix mv compat #17

Merged
merged 3 commits into from
Aug 20, 2023
Merged

fix mv compat #17

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3ec64c
refactor, add join listener + delay changing gamemode by 2 ticks when…
456dev Aug 18, 2023
48def3c
add run-tests intellij configuration
456dev Aug 18, 2023
f28268e
Delete run-tests.run.xml
tastybento Aug 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 50 additions & 24 deletions src/main/java/world/bentobox/parkour/listeners/CourseRunnerListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
import java.util.Optional;
import java.util.UUID;

import org.bukkit.Bukkit;
import org.bukkit.EntityEffect;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
Expand All @@ -20,6 +22,7 @@
import org.bukkit.event.player.PlayerChangedWorldEvent;
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.util.Vector;
Expand Down Expand Up @@ -84,33 +87,54 @@ public void onVisitorArrive(IslandEnterEvent e) {
// since exit would trigger first
// cross (unmanaged) world teleportation is handled in onPlayerChangeWorld

if (island.getFlag(addon.PARKOUR_CREATIVE) <= island.getRank(user)) {
user.setGameMode(GameMode.CREATIVE);
} else {
user.setGameMode(GameMode.SURVIVAL);
}
updateGamemode(island, user);
}
}

@EventHandler
public void onPlayerChangeWorld(PlayerChangedWorldEvent event) {
User user = User.getInstance(event.getPlayer());
Location currentLocation = user.getLocation();
boolean fromParkour = addon.inWorld(event.getFrom());
boolean toParkour = addon.inWorld(currentLocation);
World newWorld = user.getWorld();
boolean toParkour = addon.inWorld(newWorld);

if (toParkour && !fromParkour) {
// switching from non-parkour world to parkour world
addon.getIslandsManager().getIslandAt(currentLocation).ifPresent(island -> {
if (island.getFlag(addon.PARKOUR_CREATIVE) <= island.getRank(user)) {
user.setGameMode(GameMode.CREATIVE);
} else {
user.setGameMode(GameMode.SURVIVAL);
Bukkit.getServer().getScheduler().runTaskLater(addon.getPlugin(), () -> {
Location currentLocation = user.getLocation();

// world has changed in the 2 ticks delay, dont set gamemode
if (currentLocation.getWorld() != newWorld) {
return;
}
});

addon.getIslandsManager().getIslandAt(currentLocation).ifPresent(island -> updateGamemode(island, user));
}, 2); // 2 ticks since multiverse overrides gamemode after 1 tick
}
}


@EventHandler
public void onPlayerJoin(PlayerJoinEvent event) {
User user = User.getInstance(event.getPlayer());
World world = user.getWorld();
if (!addon.inWorld(world)) {
return;
}

Bukkit.getServer().getScheduler().runTaskLater(addon.getPlugin(), () -> {
Location currentLocation = user.getLocation();

// world has changed in the 2 ticks delay, dont set gamemode
if (currentLocation.getWorld() != world) {
return;
}

addon.getIslandsManager().getIslandAt(currentLocation).ifPresent(island -> updateGamemode(island, user));
}, 2);
}


@EventHandler(priority = EventPriority.NORMAL)
public void onVisitorLeave(IslandExitEvent e) {
// If the user leaves any island, end and clear the session.
Expand Down Expand Up @@ -154,14 +178,14 @@ public void onVisitorFall(EntityDamageEvent e) {
checkpointLocation = checkpointLocation.clone().add(0.5, 0, 0.5);
parkourRunManager.currentlyTeleporting().add(player.getUniqueId());
Util.teleportAsync(player, checkpointLocation, PlayerTeleportEvent.TeleportCause.PLUGIN)
.thenAccept(b -> parkourRunManager.currentlyTeleporting().remove(player.getUniqueId()));
.thenAccept(b -> parkourRunManager.currentlyTeleporting().remove(player.getUniqueId()));
}

@EventHandler
public void onTeleport(PlayerTeleportEvent e) {
boolean shouldStopRun = switch (e.getCause()) {
case ENDER_PEARL, CHORUS_FRUIT, DISMOUNT, EXIT_BED, NETHER_PORTAL, END_PORTAL -> false;
case COMMAND, PLUGIN, SPECTATE, END_GATEWAY, UNKNOWN -> true;
case ENDER_PEARL, CHORUS_FRUIT, DISMOUNT, EXIT_BED, NETHER_PORTAL, END_PORTAL -> false;
case COMMAND, PLUGIN, SPECTATE, END_GATEWAY, UNKNOWN -> true;
};
UUID playerUUID = e.getPlayer().getUniqueId();
if (!parkourRunManager.currentlyTeleporting().contains(playerUUID) && shouldStopRun && parkourRunManager.timers().containsKey(playerUUID)) {
Expand All @@ -182,20 +206,22 @@ public void onTeleport(PlayerTeleportEvent e) {
Optional<Island> toIsland = addon.getIslands().getIslandAt(e.getTo());

boolean shouldAlterGamemode = switch (e.getCause()) {
case COMMAND, PLUGIN, UNKNOWN -> true;
default -> false;
case COMMAND, PLUGIN, UNKNOWN -> true;
default -> false;
};
if (shouldAlterGamemode && fromIsland.isPresent() && toIsland.isPresent() && fromIsland.get().equals(toIsland.get())) {
// same island teleport
Island island = fromIsland.get();
User user = User.getInstance(e.getPlayer());
if (island.getFlag(addon.PARKOUR_CREATIVE) <= island.getRank(user)) {
user.setGameMode(GameMode.CREATIVE);
} else {
user.setGameMode(GameMode.SURVIVAL);
}
updateGamemode(fromIsland.get(), user);
}
}

private void updateGamemode(Island island, User user) {
if (island.getFlag(addon.PARKOUR_CREATIVE) <= island.getRank(user)) {
user.setGameMode(GameMode.CREATIVE);
} else {
user.setGameMode(GameMode.SURVIVAL);
}
}


Expand Down
Loading