Adding upper limit
Dieser Commit ist enthalten in:
Ursprung
3ca7c7049d
Commit
52c4976f09
@ -21,8 +21,9 @@ public class PistonListener implements Listener {
|
||||
BlockFace b = e.getDirection();
|
||||
for(Block block : e.getBlocks()){
|
||||
if(
|
||||
!Region.isIn2DRange(block.getLocation(), Config.TeamBlueCornerX + b.getModX(), Config.TeamBlueCornerZ + b.getModZ(), Config.SchemsizeX, Config.SchemsizeZ, Config.BorderFromSchematic) &&
|
||||
!Region.isIn2DRange(block.getLocation(), Config.TeamRedCornerX + b.getModX(), Config.TeamRedCornerZ + b.getModZ(), Config.SchemsizeX, Config.SchemsizeZ, Config.BorderFromSchematic)
|
||||
block.getY() > Config.upperArenaBorder ||
|
||||
(!Region.isIn2DRange(block.getLocation(), Config.TeamBlueCornerX + b.getModX(), Config.TeamBlueCornerZ + b.getModZ(), Config.SchemsizeX, Config.SchemsizeZ, Config.BorderFromSchematic) &&
|
||||
!Region.isIn2DRange(block.getLocation(), Config.TeamRedCornerX + b.getModX(), Config.TeamRedCornerZ + b.getModZ(), Config.SchemsizeX, Config.SchemsizeZ, Config.BorderFromSchematic))
|
||||
){
|
||||
e.setCancelled(true);
|
||||
return;
|
||||
@ -38,8 +39,9 @@ public class PistonListener implements Listener {
|
||||
BlockFace b = e.getDirection();
|
||||
for(Block block : e.getBlocks()){
|
||||
if(
|
||||
!Region.isIn2DRange(block.getLocation(), Config.TeamBlueCornerX + b.getModX(), Config.TeamBlueCornerZ + b.getModZ(), Config.SchemsizeX, Config.SchemsizeZ, Config.BorderFromSchematic) &&
|
||||
!Region.isIn2DRange(block.getLocation(), Config.TeamRedCornerX + b.getModX(), Config.TeamRedCornerZ + b.getModZ(), Config.SchemsizeX, Config.SchemsizeZ, Config.BorderFromSchematic)
|
||||
block.getY() > Config.upperArenaBorder ||
|
||||
(!Region.isIn2DRange(block.getLocation(), Config.TeamBlueCornerX + b.getModX(), Config.TeamBlueCornerZ + b.getModZ(), Config.SchemsizeX, Config.SchemsizeZ, Config.BorderFromSchematic) &&
|
||||
!Region.isIn2DRange(block.getLocation(), Config.TeamRedCornerX + b.getModX(), Config.TeamRedCornerZ + b.getModZ(), Config.SchemsizeX, Config.SchemsizeZ, Config.BorderFromSchematic))
|
||||
){
|
||||
e.setCancelled(true);
|
||||
return;
|
||||
|
@ -30,6 +30,8 @@ public class PlayerMoveListener implements Listener {
|
||||
return;
|
||||
}
|
||||
|
||||
boolean inArenaY = to.getY() + 1.8 <= Config.upperArenaBorder;
|
||||
|
||||
//Check under Arena
|
||||
if(to.getY() <= Config.underArenaBorder) {
|
||||
if(fightTeam == null){
|
||||
@ -42,11 +44,15 @@ public class PlayerMoveListener implements Listener {
|
||||
else
|
||||
player.teleport(Config.TeamBlueSpawn);
|
||||
return;
|
||||
}else if(fightTeam != null && !inArenaY){
|
||||
player.teleport(from);
|
||||
player.sendMessage(FightSystem.PREFIX + "§cDu darfst die Arena nicht verlassen!");
|
||||
return;
|
||||
}
|
||||
|
||||
//Check TeamAreas
|
||||
boolean inBlueArea = Region.isIn2DRange(to, Config.TeamBlueCornerX, Config.TeamBlueCornerZ, Config.SchemsizeX, Config.SchemsizeZ, Config.BorderFromSchematic);
|
||||
boolean inRedArea = Region.isIn2DRange(to, Config.TeamRedCornerX, Config.TeamRedCornerZ, Config.SchemsizeX, Config.SchemsizeZ, Config.BorderFromSchematic);
|
||||
boolean inBlueArea = inArenaY && Region.isIn2DRange(to, Config.TeamBlueCornerX, Config.TeamBlueCornerZ, Config.SchemsizeX, Config.SchemsizeZ, Config.BorderFromSchematic);
|
||||
boolean inRedArea = inArenaY && Region.isIn2DRange(to, Config.TeamRedCornerX, Config.TeamRedCornerZ, Config.SchemsizeX, Config.SchemsizeZ, Config.BorderFromSchematic);
|
||||
|
||||
if(inBlueArea || inRedArea) {
|
||||
if(fightTeam == null){
|
||||
|
@ -32,6 +32,7 @@ public class Config {
|
||||
public static int Schem2BorderZ;
|
||||
public static int underArenaBorder;
|
||||
public static int BorderFromSchematic;
|
||||
public static int upperArenaBorder;
|
||||
|
||||
public static boolean OnlyPublicSchematics;
|
||||
public static String SchematicDirectory;
|
||||
@ -163,6 +164,8 @@ public class Config {
|
||||
TeamBlueCornerZ -= SchemsizeZ;
|
||||
}
|
||||
|
||||
upperArenaBorder = TeamBlueCornerY + SchemsizeY + BorderFromSchematic;
|
||||
|
||||
TeamRedCornerX = TeamBluetoReddistanceX + TeamBlueCornerX;
|
||||
TeamRedCornerY = TeamBluetoReddistanceY + TeamBlueCornerY;
|
||||
TeamRedCornerZ = TeamBluetoReddistanceZ + TeamBlueCornerZ;
|
||||
|
In neuem Issue referenzieren
Einen Benutzer sperren