ChromaGaming/unconflicted-Hardcore
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into Ali

Browse source
This commit is contained in:
alisolarflare 2016-10-22 21:14:30 -04:00
parent f09d00fd1a e86754efcb
commit c1bd614935
2 changed files with 12 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/alisolarflare/RandomTPModule.java
View file

@ -1,5 +1,6 @@
package alisolarflare; package alisolarflare;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import org.bukkit.Location; import org.bukkit.Location;
@ -26,6 +27,7 @@ public class RandomTPModule{
//every 4 players who use it will be teleported near each other. //every 4 players who use it will be teleported near each other.
//ex. iie 2000, ali 2010, byz 2005, charles 1995, wind 300, zan 310, etc //ex. iie 2000, ali 2010, byz 2005, charles 1995, wind 300, zan 310, etc
public static void conflictRtp(Player player, World world, Location minLocation, Location maxLocation){ public static void conflictRtp(Player player, World world, Location minLocation, Location maxLocation){
//INIT - xDifference, xAverage //INIT - xDifference, xAverage
int xdifference = minLocation.getBlockX() - maxLocation.getBlockX(); int xdifference = minLocation.getBlockX() - maxLocation.getBlockX();
int xAverage = (int) Math.floor(minLocation.getBlockX() + maxLocation.getBlockX() / 2); int xAverage = (int) Math.floor(minLocation.getBlockX() + maxLocation.getBlockX() / 2);
@ -35,7 +37,7 @@ public class RandomTPModule{
int zAverage = (int) Math.floor(minLocation.getBlockZ() + maxLocation.getBlockZ()); int zAverage = (int) Math.floor(minLocation.getBlockZ() + maxLocation.getBlockZ());
//CHECK - Reset Cycle //CHECK - Reset Cycle
if ((northUsed || southUsed || eastUsed || westUsed) == false){ if (!(northUsed || southUsed || eastUsed || westUsed)){
//Tries 20 times to find a location //Tries 20 times to find a location
for(int i = 0; i < 20; i ++){ for(int i = 0; i < 20; i ++){
@ -50,9 +52,10 @@ public class RandomTPModule{
//CHECKS - if ground is safe //CHECKS - if ground is safe
boolean groundIsSafe = world.getHighestBlockAt(attemptedX, attemptedZ).getType() != Material.WATER; boolean groundIsSafe = world.getHighestBlockAt(attemptedX, attemptedZ).getType() != Material.WATER;
boolean northIsSafe = world.getHighestBlockAt(attemptedX, attemptedZ-cr).getType() != Material.WATER; boolean northIsSafe = world.getHighestBlockAt(attemptedX, attemptedZ-cr).getType() != Material.WATER;
boolean eastIsSafe = world.getHighestBlockAt(attemptedX+cr, attemptedZ).getType() != Material.WATER;
boolean southIsSafe = world.getHighestBlockAt(attemptedX, attemptedZ+cr).getType() != Material.WATER; boolean southIsSafe = world.getHighestBlockAt(attemptedX, attemptedZ+cr).getType() != Material.WATER;
boolean westIsSafe = world.getHighestBlockAt(attemptedX-cr, attemptedZ).getType() != Material.WATER; boolean westIsSafe = world.getHighestBlockAt(attemptedX-cr, attemptedZ).getType() != Material.WATER;
boolean eastIsSafe = world.getHighestBlockAt(attemptedX+cr, attemptedZ).getType() != Material.WATER;
//TRANSFER - data to class //TRANSFER - data to class
if (groundIsSafe && (northIsSafe || southIsSafe || eastIsSafe || westIsSafe)){ if (groundIsSafe && (northIsSafe || southIsSafe || eastIsSafe || westIsSafe)){
@ -71,37 +74,14 @@ public class RandomTPModule{
} }
String dir = "north"; String dir = "north";
//CHOOSES A RANDOM DIRECTION //CHOOSES A RANDOM DIRECTION
for(int i = 0; i < 200; i++){ ArrayList<String> directions = new ArrayList<String>();
double randomDirection = Math.random(); if(!northUsed) directions.add("north");
if (randomDirection < 0.25){ if(!southUsed) directions.add("south");
if(!northUsed){ if(!westUsed) directions.add("west");
northUsed = true; if(!eastUsed) directions.add("east");
dir = "north"; dir = directions.get((int) Math.floor(Math.random() * directions.size()));
break;
}
}else if(randomDirection < 0.50){
if(!eastUsed){
eastUsed = true;
dir = "east";
break;
}
}else if(randomDirection < 0.75){
if(!southUsed){
southUsed = true;
dir = "south";
break;
}
}else{
if(!westUsed){
westUsed = true;
dir = "west";
break;
}
}
}
//TELEPORT - teleports player to the conflict point //TELEPORT - teleports player to the conflict point
switch(dir){ switch(dir){

1
src/iie/HelloWorldPlugin.java
View file

@ -2,7 +2,6 @@ package iie;
import java.util.AbstractMap; import java.util.AbstractMap;
import java.util.HashMap; import java.util.HashMap;
import java.util.UUID;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;