SteamWar/LobbySystem
Archiviert
13
0
Fork 0
Code Issues 3 Pull-Requests Releases Wiki Aktivität

Disables shield and fly. Nobody needs that #8

Manuell gemergt
YoyoNow hat 1 Commits von disalbeShield nach master 2020-08-15 18:06:28 +02:00 zusammengeführt
Diskussion 0 Commits 1 Geänderte Dateien 8 +6 -195
8 geänderte Dateien mit 6 neuen und 195 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

9
src/de/steamwar/lobby/LobbySystem.java
Datei anzeigen

@ -1,6 +1,5 @@
package de.steamwar.lobby;
import de.steamwar.lobby.commands.FlyCommand;
import de.steamwar.lobby.listener.*;
import org.bukkit.Bukkit;
import org.bukkit.plugin.PluginManager;
@ -14,12 +13,6 @@ public class LobbySystem extends JavaPlugin {
public void onEnable() {
instance = this;
init();
getCommand("fly").setExecutor(new FlyCommand());
}
public void init() {
PluginManager pm = Bukkit.getPluginManager();
pm.registerEvents(new PlayerMoveListener(), instance);
@ -30,12 +23,10 @@ public class LobbySystem extends JavaPlugin {
pm.registerEvents(new ParticleListener(), instance);
pm.registerEvents(new PlayerHiderListener(), instance);
pm.registerEvents(new EnderPearlListener(), instance);
pm.registerEvents(new ShieldListener(), instance);
}
public static LobbySystem getInstance() {
return instance;
}
}

42
src/de/steamwar/lobby/commands/FlyCommand.java
Datei anzeigen

@ -1,42 +0,0 @@
package de.steamwar.lobby.commands;
import de.steamwar.lobby.utils.LobbyPlayer;
import de.steamwar.sql.SteamwarUser;
import de.steamwar.sql.UserGroup;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
public class FlyCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if(!(sender instanceof Player))
return false;
Player player = (Player) sender;
SteamwarUser steamwarUser = SteamwarUser.get(player.getUniqueId());
UserGroup userGroup = steamwarUser.getUserGroup();
if(userGroup != UserGroup.Admin &&
userGroup != UserGroup.Moderator &&
userGroup != UserGroup.Developer &&
userGroup != UserGroup.Supporter &&
userGroup != UserGroup.Builder &&
userGroup != UserGroup.Youtuber) {
player.sendMessage("§cDu verfügst nicht über die benötigten Rechte!");
return false;
}
LobbyPlayer lobbyPlayer = LobbyPlayer.getLobbyPlayer(player.getUniqueId());
boolean newFlightState = !lobbyPlayer.isFly();
lobbyPlayer.setFly(newFlightState);
player.setAllowFlight(newFlightState);
player.setFlying(newFlightState);
player.sendMessage("§7Du kannst jetzt " + (newFlightState ? "§afliegen§7." : "§cnicht §7mehr fliegen."));
return false;
}
}

18
src/de/steamwar/lobby/inventories/LobbyInventory.java
Datei anzeigen

@ -2,8 +2,6 @@ package de.steamwar.lobby.inventories;
import de.steamwar.lobby.utils.ItemBuilder;
import de.steamwar.lobby.utils.LobbyPlayer;
import de.steamwar.sql.SteamwarUser;
import de.steamwar.sql.UserGroup;
import org.bukkit.Material;
import org.bukkit.entity.Player;
@ -37,22 +35,6 @@ public class LobbyInventory {
.setUnbreakable(true)
.removeAllAtributs()
.build());
UserGroup userGroup = SteamwarUser.get(player.getUniqueId()).getUserGroup();
if(userGroup != UserGroup.Admin &&
userGroup != UserGroup.Moderator &&
userGroup != UserGroup.Developer &&
userGroup != UserGroup.Supporter &&
userGroup != UserGroup.Builder &&
userGroup != UserGroup.Youtuber) {
return;
}
player.getInventory().setItem(8, new ItemBuilder(SHIELD)
.setDisplayName("§bSchild §8| " + (lobbyPlayer.isShield() ? "§aan" : "§caus"))
.setUnbreakable(true)
.removeAllAtributs()
.build());
}

4
src/de/steamwar/lobby/listener/DoubleJumpListener.java
Datei anzeigen

@ -25,8 +25,6 @@ public class DoubleJumpListener implements Listener {
@EventHandler
public void handlePlayerToggleFlight(PlayerToggleFlightEvent event) {
Player player = event.getPlayer();
if(LobbyPlayer.getLobbyPlayer(player.getUniqueId()).isFly())
return;
event.setCancelled(true);
player.setAllowFlight(false);
@ -44,8 +42,6 @@ public class DoubleJumpListener implements Listener {
@EventHandler
public void handlePlayerMove(PlayerMoveEvent event) {
Player player = event.getPlayer();
if(LobbyPlayer.getLobbyPlayer(player.getUniqueId()).isFly())
return;
if(player.getLocation().add(0, -1, 0).getBlock().getType() == Material.AIR)
return;

3
src/de/steamwar/lobby/listener/PlayerConnectionListener.java
Datei anzeigen

@ -22,8 +22,7 @@ public class PlayerConnectionListener implements Listener {
event.setJoinMessage(null);
Player player = event.getPlayer();
LobbyPlayer lp = LobbyPlayer.getLobbyPlayer(player.getUniqueId()); //initialisiert einen neuen LP falls nicht vorhanden
lp.setShield(false);
LobbyPlayer.getLobbyPlayer(player.getUniqueId()); //initialisiert einen neuen LP falls nicht vorhanden
player.teleport(new Location(Bukkit.getWorlds().get(0), Config.SpawnX, Config.SpawnY, Config.SpawnZ, Config.Yaw, Config.Pitch));
player.getInventory().clear();

95
src/de/steamwar/lobby/listener/ShieldListener.java
Datei anzeigen

@ -1,95 +0,0 @@
package de.steamwar.lobby.listener;
import de.steamwar.lobby.inventories.LobbyInventory;
import de.steamwar.lobby.utils.LobbyPlayer;
import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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.util.Vector;
import java.util.Collection;
public class ShieldListener implements Listener {
double radius = 1.5D;
double multiplyer = 1.1D;
float height = 1.0F;
@EventHandler
public void handlePlayerMove(PlayerMoveEvent event) {
Player player = event.getPlayer();
LobbyPlayer lobbyPlayer = LobbyPlayer.getLobbyPlayer(player.getUniqueId());
World world = player.getWorld();
Location playerLocation = event.getTo();
Collection<Entity> nearbyEntities = world.getNearbyEntities(playerLocation, radius, radius, radius);
if(lobbyPlayer.isShield()) {
for(Entity entity : nearbyEntities) {
if(!(entity instanceof Player)) {
continue;
}
Player entityPlayer = (Player) entity;
if(entityPlayer.getUniqueId() == player.getUniqueId()) {
continue;
}
if(LobbyPlayer.getLobbyPlayer(entityPlayer.getUniqueId()).isShield()) {
continue;
}
world.playEffect(playerLocation, Effect.ENDER_SIGNAL, 1);
Location location = entityPlayer.getLocation();
double x = location.getX() - playerLocation.getX();
double y = location.getY() - playerLocation.getY();
double z = location.getZ() - playerLocation.getZ();
entityPlayer.setVelocity(new Vector(x, y, z).multiply(multiplyer).add(new Vector(0.0F, height, 0.0F)));
}
} else {
for(Entity entity : nearbyEntities) {
if(!(entity instanceof Player)) {
continue;
}
Player entityPlayer = (Player) entity;
LobbyPlayer entityPlayerLP = LobbyPlayer.getLobbyPlayer(entityPlayer.getUniqueId());
if(!entityPlayerLP.isShield())
continue;
world.playEffect(entityPlayer.getLocation(), Effect.ENDER_SIGNAL, 1);
Location location = entityPlayer.getLocation();
double x = playerLocation.getX() - location.getX();
double y = playerLocation.getY() - location.getY();
double z = playerLocation.getZ() - location.getZ();
player.setVelocity(new Vector(x, y, z).multiply(multiplyer).add(new Vector(0.0F, height, 0.0F)));
}
}
}
@EventHandler
public void handlePlayerInteract(PlayerInteractEvent event) {
if(event.getMaterial() != LobbyInventory.SHIELD) return;
Action action = event.getAction();
if(action != Action.RIGHT_CLICK_AIR && action != Action.RIGHT_CLICK_BLOCK) return;
event.setCancelled(true);
Player player = event.getPlayer();
LobbyPlayer lobbyPlayer = LobbyPlayer.getLobbyPlayer(player.getUniqueId());
lobbyPlayer.setShield(!lobbyPlayer.isShield());
LobbyInventory.givePlayerLobbyItems(player);
}
}

20
src/de/steamwar/lobby/utils/LobbyPlayer.java
Datei anzeigen

@ -6,13 +6,11 @@ import java.util.*;
public class LobbyPlayer {
private static Map<UUID, LobbyPlayer> cache = new HashMap();
private static Map<UUID, LobbyPlayer> cache = new HashMap<>();
private PlayerHiderState hiderState;
private Particle particle;
private boolean fly;
private boolean enderPearlUsed;
private boolean shield;
private LobbyPlayer(UUID uuid) {
this.hiderState = PlayerHiderState.SHOW_ALL;
@ -35,14 +33,6 @@ public class LobbyPlayer {
this.particle = particle;
}
public boolean isFly() {
return fly;
}
public void setFly(boolean fly) {
this.fly = fly;
}
public boolean isEnderPearlUsed() {
return enderPearlUsed;
}
@ -51,14 +41,6 @@ public class LobbyPlayer {
this.enderPearlUsed = enderPearlUsed;
}
public boolean isShield() {
return shield;
}
public void setShield(boolean shield) {
this.shield = shield;
}
public void nexthHiderState() {
if(this.hiderState == PlayerHiderState.SHOW_ALL) {
this.hiderState = PlayerHiderState.SHOW_TEAM;

10
src/plugin.yml
Datei anzeigen

@ -1,9 +1,7 @@
name: LobbySystem
version: 1.0
version: "1.0"
author: Yaruma3341
depend: [SpigotCore]
depend:
- SpigotCore
main: de.steamwar.lobby.LobbySystem
api-version: 1.13
commands:
fly:
api-version: "1.13"