Upstream/EpicHoppers
1
0
Fork 0
mirror of https://github.com/songoda/EpicHoppers.git synced 2024-11-26 04:05:48 +01:00
Code Issues Projects Releases Wiki Activity

Added the ability for entities to teleport through hoppers.

Browse Source
This commit is contained in:
Brianna 2019-05-01 07:43:41 -04:00
parent 4cc341b859
commit c633ef24ea
5 changed files with 47 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/gui/GUIOverview.java
View File

@ -285,7 +285,7 @@ public class GUIOverview extends AbstractGUI {
.getDisplayName().equals(plugin.getLocale().getMessage("interface.hopper.perltitle"))) {
if (type == ClickType.LEFT) {
if (hopper.getLinkedBlocks() != null) {
plugin.getTeleportHandler().tpPlayer(player, hopper);
plugin.getTeleportHandler().tpEntity(player, hopper);
player.closeInventory();
}
} else {

48
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/handlers/TeleportHandler.java
View File

@ -3,24 +3,29 @@ package com.songoda.epichoppers.handlers;
import com.songoda.epichoppers.EpicHoppersPlugin;
import com.songoda.epichoppers.api.hopper.Hopper;
import com.songoda.epichoppers.api.hopper.TeleportTrigger;
import com.songoda.epichoppers.player.PlayerData;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.utils.Methods;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Sound;
import org.bukkit.World;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryHolder;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
public class TeleportHandler {
//Teleport from - teleport 2
private final Map<Location, Location> teleportFrom = new HashMap<>();
private final Map<UUID, Long> lastTeleports = new HashMap<>();
private EpicHoppersPlugin instance;
@ -34,12 +39,16 @@ public class TeleportHandler {
}
private void teleportRunner() {
for (Player player : Bukkit.getOnlinePlayers()) {
if (!instance.getConfig().getBoolean("Main.Allow Players To Teleport Through Hoppers") || !player.hasPermission("EpicHoppers.Teleport")) {
for (World world : Bukkit.getWorlds()) {
for (Entity entity : world.getEntities()) {
if (!(entity instanceof LivingEntity) ||entity.getType() == EntityType.ARMOR_STAND) continue;
if (!instance.getConfig().getBoolean("Main.Allow Players To Teleport Through Hoppers")
|| entity instanceof Player && !((Player)entity).hasPermission("EpicHoppers.Teleport")) {
continue;
}
Location location = player.getLocation().getBlock().getRelative(BlockFace.DOWN).getLocation();
Location location = entity.getLocation().getBlock().getRelative(BlockFace.DOWN).getLocation();
if (!instance.getHopperManager().isHopper(location)) {
continue;
@ -49,21 +58,20 @@ public class TeleportHandler {
if (hopper.getTeleportTrigger() != TeleportTrigger.WALK_ON) continue;
PlayerData playerData = instance.getPlayerDataManager().getPlayerData(player);
if (playerData.getLastTeleport() != null) {
long duration = (new Date()).getTime() - playerData.getLastTeleport().getTime();
if (lastTeleports.containsKey(entity.getUniqueId())) {
long duration = (new Date()).getTime() - new Date(lastTeleports.get(entity.getUniqueId())).getTime();
if (duration <= 5 * 1000) {
continue;
}
}
tpPlayer(player, hopper);
playerData.setLastTeleport(new Date());
tpEntity(entity, hopper);
lastTeleports.put(entity.getUniqueId(), System.currentTimeMillis());
}
}
}
public void tpPlayer(Player player, Hopper hopper) {
public void tpEntity(Entity entity, Hopper hopper) {
try {
if (hopper == null || !instance.getHopperManager().isHopper(hopper.getLocation())) return;
@ -73,7 +81,7 @@ public class TeleportHandler {
boolean empty = lastHopper.getLinkedBlocks().isEmpty();
if (empty && i == 0) {
if (teleportFrom.containsKey(hopper.getLocation()))
doTeleport(player, teleportFrom.get(hopper.getLocation()).clone());
doTeleport(entity, teleportFrom.get(hopper.getLocation()).clone());
return;
}
@ -84,21 +92,21 @@ public class TeleportHandler {
}
teleportFrom.put(lastHopper.getLocation(), hopper.getLocation());
doTeleport(player, lastHopper.getLocation());
doTeleport(entity, lastHopper.getLocation());
} catch (Exception e) {
Debugger.runReport(e);
}
}
private void doTeleport(Player player, Location location) {
private void doTeleport(Entity entity, Location location) {
location.add(.0, 1, .0);
location.setPitch(player.getLocation().getPitch());
location.setDirection(player.getLocation().getDirection());
Methods.doParticles(player, location);
Methods.doParticles(player, player.getLocation().getBlock().getRelative(BlockFace.DOWN).getLocation());
player.teleport(location);
location.setPitch(entity.getLocation().getPitch());
location.setDirection(entity.getLocation().getDirection());
Methods.doParticles(entity, location);
Methods.doParticles(entity, entity.getLocation().getBlock().getRelative(BlockFace.DOWN).getLocation());
entity.teleport(location);
if (instance.getConfig().getBoolean("Main.Sounds Enabled"))
player.playSound(player.getLocation(), Sound.ENTITY_ENDERMAN_TELEPORT, 10, 10);
entity.getWorld().playSound(entity.getLocation(), Sound.ENTITY_ENDERMAN_TELEPORT, 10, 10);
}
}

7
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/InteractListeners.java
View File

@ -8,7 +8,6 @@ import com.songoda.epichoppers.player.PlayerData;
import com.songoda.epichoppers.player.SyncType;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.utils.Methods;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.BlockFace;
@ -18,8 +17,6 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.event.player.PlayerToggleSneakEvent;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
@ -44,11 +41,11 @@ public class InteractListeners implements Listener {
if (instance.getHopperManager().isHopper(down)) {
Hopper hopper = instance.getHopperManager().getHopper(down);
if (hopper.getTeleportTrigger() == TeleportTrigger.SNEAK)
instance.getTeleportHandler().tpPlayer(player, hopper);
instance.getTeleportHandler().tpEntity(player, hopper);
} else if (instance.getHopperManager().isHopper(location)) {
Hopper hopper = instance.getHopperManager().getHopper(location);
if (hopper.getTeleportTrigger() == TeleportTrigger.SNEAK)
instance.getTeleportHandler().tpPlayer(player, hopper);
instance.getTeleportHandler().tpEntity(player, hopper);
}
}
}

10
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/player/PlayerData.java
View File

@ -13,8 +13,6 @@ public class PlayerData {
private SyncType syncType = null; // Null means off.
private Date lastTeleport = null; // Null means off.
PlayerData(UUID playerUUID) {
this.playerUUID = playerUUID;
}
@ -34,12 +32,4 @@ public class PlayerData {
public void setSyncType(SyncType syncType) {
this.syncType = syncType;
}
public Date getLastTeleport() {
return lastTeleport;
}
public void setLastTeleport(Date lastTeleport) {
this.lastTeleport = lastTeleport;
}
}

5
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/utils/Methods.java
View File

@ -3,6 +3,7 @@ package com.songoda.epichoppers.utils;
import com.songoda.epichoppers.EpicHoppersPlugin;
import org.bukkit.*;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
@ -93,13 +94,13 @@ public class Methods {
return null;
}
public static void doParticles(Player p, Location location) {
public static void doParticles(Entity entity, Location location) {
try {
EpicHoppersPlugin instance = EpicHoppersPlugin.getInstance();
location.setX(location.getX() + .5);
location.setY(location.getY() + .5);
location.setZ(location.getZ() + .5);
p.getWorld().spawnParticle(org.bukkit.Particle.valueOf(instance.getConfig().getString("Main.Upgrade Particle Type")), location, 200, .5, .5, .5);
entity.getWorld().spawnParticle(org.bukkit.Particle.valueOf(instance.getConfig().getString("Main.Upgrade Particle Type")), location, 200, .5, .5, .5);
} catch (Exception e) {
Debugger.runReport(e);
}