Adds underwater portal support using any wall coral as a button replacement
This commit is contained in:
@ -4,7 +4,6 @@ import net.knarcraft.stargate.event.StargateAccessEvent;
|
||||
import net.knarcraft.stargate.event.StargateDestroyEvent;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.GameMode;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.Server;
|
||||
import org.bukkit.Tag;
|
||||
@ -20,11 +19,9 @@ import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.entity.Vehicle;
|
||||
import org.bukkit.event.Event.Result;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.block.Action;
|
||||
import org.bukkit.event.block.BlockBreakEvent;
|
||||
import org.bukkit.event.block.BlockFromToEvent;
|
||||
import org.bukkit.event.block.BlockPhysicsEvent;
|
||||
@ -32,10 +29,6 @@ import org.bukkit.event.block.BlockPistonExtendEvent;
|
||||
import org.bukkit.event.block.BlockPistonRetractEvent;
|
||||
import org.bukkit.event.block.SignChangeEvent;
|
||||
import org.bukkit.event.entity.EntityExplodeEvent;
|
||||
import org.bukkit.event.player.PlayerInteractEvent;
|
||||
import org.bukkit.event.player.PlayerJoinEvent;
|
||||
import org.bukkit.event.player.PlayerMoveEvent;
|
||||
import org.bukkit.event.player.PlayerTeleportEvent;
|
||||
import org.bukkit.event.server.PluginDisableEvent;
|
||||
import org.bukkit.event.server.PluginEnableEvent;
|
||||
import org.bukkit.event.vehicle.VehicleMoveEvent;
|
||||
@ -47,10 +40,7 @@ import org.bukkit.plugin.PluginManager;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
import org.bukkit.plugin.java.JavaPluginLoader;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedList;
|
||||
@ -170,7 +160,7 @@ public class Stargate extends JavaPlugin {
|
||||
log.info(pdfFile.getName() + " v." + pdfFile.getVersion() + " is enabled.");
|
||||
|
||||
// Register events before loading gates to stop weird things happening.
|
||||
pm.registerEvents(new pListener(), this);
|
||||
pm.registerEvents(new PlayerEventsListener(), this);
|
||||
pm.registerEvents(new bListener(), this);
|
||||
|
||||
pm.registerEvents(new vListener(), this);
|
||||
@ -759,273 +749,25 @@ public class Stargate extends JavaPlugin {
|
||||
}
|
||||
}
|
||||
|
||||
private class pListener implements Listener {
|
||||
@EventHandler
|
||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
||||
if (!enableBungee) return;
|
||||
|
||||
Player player = event.getPlayer();
|
||||
String destination = bungeeQueue.remove(player.getName().toLowerCase());
|
||||
if (destination == null) return;
|
||||
|
||||
Portal portal = Portal.getBungeeGate(destination);
|
||||
if (portal == null) {
|
||||
Stargate.debug("PlayerJoin", "Error fetching destination portal: " + destination);
|
||||
return;
|
||||
}
|
||||
portal.teleport(player, portal, null);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerTeleport(PlayerTeleportEvent event) {
|
||||
// cancel portal and endgateway teleportation if it's from a stargate entrance
|
||||
PlayerTeleportEvent.TeleportCause cause = event.getCause();
|
||||
if (!event.isCancelled()
|
||||
&& (cause == PlayerTeleportEvent.TeleportCause.NETHER_PORTAL
|
||||
|| cause == PlayerTeleportEvent.TeleportCause.END_GATEWAY && World.Environment.THE_END == event.getFrom().getWorld().getEnvironment())
|
||||
&& Portal.getByAdjacentEntrance(event.getFrom()) != null) {
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerMove(PlayerMoveEvent event) {
|
||||
if (event.isCancelled()) return;
|
||||
|
||||
// Check to see if the player actually moved
|
||||
if (event.getFrom().getBlockX() == event.getTo().getBlockX() && event.getFrom().getBlockY() == event.getTo().getBlockY() && event.getFrom().getBlockZ() == event.getTo().getBlockZ()) {
|
||||
return;
|
||||
}
|
||||
|
||||
Player player = event.getPlayer();
|
||||
Portal portal = Portal.getByEntrance(event.getTo());
|
||||
// No portal or not open
|
||||
if (portal == null || !portal.isOpen()) return;
|
||||
|
||||
// Not open for this player
|
||||
if (!portal.isOpenFor(player)) {
|
||||
Stargate.sendMessage(player, Stargate.getString("denyMsg"));
|
||||
portal.teleport(player, portal, event);
|
||||
return;
|
||||
}
|
||||
|
||||
Portal destination = portal.getDestination(player);
|
||||
if (!portal.isBungee() && destination == null) return;
|
||||
|
||||
boolean deny = false;
|
||||
// Check if player has access to this server for Bungee gates
|
||||
if (portal.isBungee()) {
|
||||
if (!canAccessServer(player, portal.getNetwork())) {
|
||||
deny = true;
|
||||
}
|
||||
} else {
|
||||
// Check if player has access to this network
|
||||
if (!canAccessNetwork(player, portal.getNetwork())) {
|
||||
deny = true;
|
||||
}
|
||||
|
||||
// Check if player has access to destination world
|
||||
if (!canAccessWorld(player, destination.getWorld().getName())) {
|
||||
deny = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!canAccessPortal(player, portal, deny)) {
|
||||
Stargate.sendMessage(player, Stargate.getString("denyMsg"));
|
||||
portal.teleport(player, portal, event);
|
||||
portal.close(false);
|
||||
return;
|
||||
}
|
||||
|
||||
int cost = Stargate.getUseCost(player, portal, destination);
|
||||
if (cost > 0) {
|
||||
boolean success;
|
||||
if (portal.getGate().getToOwner()) {
|
||||
success = portal.getOwnerUUID() != null && Stargate.chargePlayer(player, portal.getOwnerUUID(), cost);
|
||||
} else {
|
||||
success = Stargate.chargePlayer(player, cost);
|
||||
}
|
||||
if (!success) {
|
||||
// Insufficient Funds
|
||||
Stargate.sendMessage(player, Stargate.getString("inFunds"));
|
||||
portal.close(false);
|
||||
return;
|
||||
}
|
||||
String deductMsg = Stargate.getString("ecoDeduct");
|
||||
deductMsg = Stargate.replaceVars(deductMsg, new String[]{"%cost%", "%portal%"}, new String[]{EconomyHandler.format(cost), portal.getName()});
|
||||
sendMessage(player, deductMsg, false);
|
||||
if (portal.getGate().getToOwner() && portal.getOwnerUUID() != null) {
|
||||
Player p;
|
||||
if (portal.getOwnerUUID() != null) {
|
||||
p = server.getPlayer(portal.getOwnerUUID());
|
||||
} else {
|
||||
p = server.getPlayer(portal.getOwnerName());
|
||||
}
|
||||
if (p != null) {
|
||||
String obtainedMsg = Stargate.getString("ecoObtain");
|
||||
obtainedMsg = Stargate.replaceVars(obtainedMsg, new String[]{"%cost%", "%portal%"}, new String[]{EconomyHandler.format(cost), portal.getName()});
|
||||
Stargate.sendMessage(p, obtainedMsg, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Stargate.sendMessage(player, Stargate.getString("teleportMsg"), false);
|
||||
|
||||
// BungeeCord Support
|
||||
if (portal.isBungee()) {
|
||||
if (!enableBungee) {
|
||||
player.sendMessage(Stargate.getString("bungeeDisabled"));
|
||||
portal.close(false);
|
||||
return;
|
||||
}
|
||||
|
||||
// Teleport the player back to this gate, for sanity's sake
|
||||
portal.teleport(player, portal, event);
|
||||
|
||||
// Send the SGBungee packet first, it will be queued by BC if required
|
||||
try {
|
||||
// Build the message, format is <player>#@#<destination>
|
||||
String msg = event.getPlayer().getName() + "#@#" + portal.getDestinationName();
|
||||
// Build the message data, sent over the SGBungee bungeecord channel
|
||||
ByteArrayOutputStream bao = new ByteArrayOutputStream();
|
||||
DataOutputStream msgData = new DataOutputStream(bao);
|
||||
msgData.writeUTF("Forward");
|
||||
msgData.writeUTF(portal.getNetwork()); // Server
|
||||
msgData.writeUTF("SGBungee"); // Channel
|
||||
msgData.writeShort(msg.length()); // Data Length
|
||||
msgData.writeBytes(msg); // Data
|
||||
player.sendPluginMessage(stargate, "BungeeCord", bao.toByteArray());
|
||||
} catch (IOException ex) {
|
||||
Stargate.log.severe(Stargate.getString("prefix") + "Error sending BungeeCord teleport packet");
|
||||
ex.printStackTrace();
|
||||
return;
|
||||
}
|
||||
|
||||
// Connect player to new server
|
||||
try {
|
||||
ByteArrayOutputStream bao = new ByteArrayOutputStream();
|
||||
DataOutputStream msgData = new DataOutputStream(bao);
|
||||
msgData.writeUTF("Connect");
|
||||
msgData.writeUTF(portal.getNetwork());
|
||||
|
||||
player.sendPluginMessage(stargate, "BungeeCord", bao.toByteArray());
|
||||
bao.reset();
|
||||
} catch (IOException ex) {
|
||||
Stargate.log.severe(Stargate.getString("prefix") + "Error sending BungeeCord connect packet");
|
||||
ex.printStackTrace();
|
||||
return;
|
||||
}
|
||||
|
||||
// Close portal if required (Should never be)
|
||||
portal.close(false);
|
||||
return;
|
||||
}
|
||||
|
||||
destination.teleport(player, portal, event);
|
||||
portal.close(false);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerInteract(PlayerInteractEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
Block block = event.getClickedBlock();
|
||||
|
||||
if (block == null) return;
|
||||
|
||||
// Right click
|
||||
if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
||||
if (block.getBlockData() instanceof WallSign) {
|
||||
Portal portal = Portal.getByBlock(block);
|
||||
if (portal == null) return;
|
||||
// Cancel item use
|
||||
event.setUseItemInHand(Result.DENY);
|
||||
event.setUseInteractedBlock(Result.DENY);
|
||||
|
||||
boolean deny = false;
|
||||
if (!Stargate.canAccessNetwork(player, portal.getNetwork())) {
|
||||
deny = true;
|
||||
}
|
||||
|
||||
if (!Stargate.canAccessPortal(player, portal, deny)) {
|
||||
Stargate.sendMessage(player, Stargate.getString("denyMsg"));
|
||||
return;
|
||||
}
|
||||
|
||||
if ((!portal.isOpen()) && (!portal.isFixed())) {
|
||||
portal.cycleDestination(player);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// Implement right-click to toggle a stargate, gets around spawn protection problem.
|
||||
if (Tag.BUTTONS.isTagged(block.getType())) {
|
||||
Portal portal = Portal.getByBlock(block);
|
||||
if (portal == null) return;
|
||||
|
||||
// Cancel item use
|
||||
event.setUseItemInHand(Result.DENY);
|
||||
event.setUseInteractedBlock(Result.DENY);
|
||||
|
||||
boolean deny = false;
|
||||
if (!Stargate.canAccessNetwork(player, portal.getNetwork())) {
|
||||
deny = true;
|
||||
}
|
||||
|
||||
if (!Stargate.canAccessPortal(player, portal, deny)) {
|
||||
Stargate.sendMessage(player, Stargate.getString("denyMsg"));
|
||||
return;
|
||||
}
|
||||
|
||||
openPortal(player, portal);
|
||||
if (portal.isOpenFor(player)) {
|
||||
event.setUseInteractedBlock(Result.ALLOW);
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// Left click
|
||||
if (event.getAction() == Action.LEFT_CLICK_BLOCK) {
|
||||
// Check if we're scrolling a sign
|
||||
if (block.getBlockData() instanceof WallSign) {
|
||||
Portal portal = Portal.getByBlock(block);
|
||||
if (portal == null) return;
|
||||
|
||||
event.setUseInteractedBlock(Result.DENY);
|
||||
// Only cancel event in creative mode
|
||||
if (player.getGameMode().equals(GameMode.CREATIVE)) {
|
||||
event.setCancelled(true);
|
||||
}
|
||||
|
||||
boolean deny = false;
|
||||
if (!Stargate.canAccessNetwork(player, portal.getNetwork())) {
|
||||
deny = true;
|
||||
}
|
||||
|
||||
if (!Stargate.canAccessPortal(player, portal, deny)) {
|
||||
Stargate.sendMessage(player, Stargate.getString("denyMsg"));
|
||||
return;
|
||||
}
|
||||
|
||||
if ((!portal.isOpen()) && (!portal.isFixed())) {
|
||||
portal.cycleDestination(player, -1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private class bListener implements Listener {
|
||||
@EventHandler
|
||||
public void onSignChange(SignChangeEvent event) {
|
||||
if (event.isCancelled()) return;
|
||||
if (event.isCancelled()) {
|
||||
return;
|
||||
}
|
||||
Player player = event.getPlayer();
|
||||
Block block = event.getBlock();
|
||||
if (!(block.getBlockData() instanceof WallSign)) return;
|
||||
if (!(block.getBlockData() instanceof WallSign)) {
|
||||
return;
|
||||
}
|
||||
|
||||
final Portal portal = Portal.createPortal(event, player);
|
||||
// Not creating a gate, just placing a sign
|
||||
if (portal == null) return;
|
||||
if (portal == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
Stargate.sendMessage(player, Stargate.getString("createMsg"), false);
|
||||
Stargate.debug("onSignChange", "Initialized stargate: " + portal.getName());
|
||||
@ -1104,7 +846,7 @@ public class Stargate extends JavaPlugin {
|
||||
// Handle keeping portal material and buttons around
|
||||
if (block.getType() == Material.NETHER_PORTAL) {
|
||||
portal = Portal.getByEntrance(block);
|
||||
} else if (Tag.BUTTONS.isTagged(block.getType())) {
|
||||
} else if (Tag.BUTTONS.isTagged(block.getType()) || MaterialHelper.isWallCoral(block.getType())) {
|
||||
portal = Portal.getByControl(block);
|
||||
}
|
||||
if (portal != null) event.setCancelled(true);
|
||||
|
||||
Reference in New Issue
Block a user