Compare commits

..

1 commit
master ... iie

Author SHA1 Message Date
BuildTools
b32970956d made zAverage divide by 2
unlike xAverage, which adds both values then divides by 2, zAverage
just added them both together. I’m guessing this was a mistake so I’m
fixing it.
2016-10-22 21:24:10 -04:00
8 changed files with 32 additions and 35 deletions

View file

@ -1,5 +1,5 @@
main: iie.ButtonHardcorePlugin main: iie.HelloWorldPlugin
version: 1.0.1 version: 1.0.0
name: ButtonHardcorePlugin name: ButtonHardcorePlugin
commands: commands:
hardcore: hardcore:

15
pom.xml
View file

@ -8,16 +8,13 @@
<resources> <resources>
<resource> <resource>
<directory>src</directory> <directory>src</directory>
<includes>
<include>*.yml</include>
</includes>
<excludes> <excludes>
<exclude>**/*.java</exclude> <exclude>**/*.java</exclude>
</excludes> </excludes>
</resource> </resource>
<resource>
<directory>.</directory>
<includes>
<include>*.yml</include>
</includes>
</resource>
</resources> </resources>
<plugins> <plugins>
<plugin> <plugin>
@ -54,4 +51,4 @@
<version>1.9.2-R0.1-SNAPSHOT</version> <version>1.9.2-R0.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

View file

@ -8,7 +8,7 @@ import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import iie.ButtonHardcorePlugin; import iie.HelloWorldPlugin;
public class RandomTPModule{ public class RandomTPModule{
private static int conflictX; private static int conflictX;
@ -19,8 +19,8 @@ public class RandomTPModule{
private static boolean eastUsed; private static boolean eastUsed;
private static boolean westUsed; private static boolean westUsed;
@SuppressWarnings("unused") @SuppressWarnings("unused")
private ButtonHardcorePlugin helloWorldPlugin; private HelloWorldPlugin helloWorldPlugin;
public RandomTPModule(ButtonHardcorePlugin helloWorldPlugin) { public RandomTPModule(HelloWorldPlugin helloWorldPlugin) {
this.helloWorldPlugin = helloWorldPlugin; this.helloWorldPlugin = helloWorldPlugin;
} }

View file

@ -14,8 +14,8 @@ import org.bukkit.event.player.PlayerMoveEvent;
public class BoundaryListener implements Listener { public class BoundaryListener implements Listener {
ButtonHardcorePlugin plugin; HelloWorldPlugin plugin;
public BoundaryListener(ButtonHardcorePlugin plugin){ public BoundaryListener(HelloWorldPlugin plugin){
this.plugin = plugin; this.plugin = plugin;
} }

View file

@ -11,8 +11,8 @@ import org.bukkit.event.entity.PlayerDeathEvent;
public class DeathListener implements Listener { public class DeathListener implements Listener {
ButtonHardcorePlugin plugin; HelloWorldPlugin plugin;
public DeathListener(ButtonHardcorePlugin plugin){ public DeathListener(HelloWorldPlugin plugin){
this.plugin = plugin; this.plugin = plugin;
} }
@ -31,8 +31,8 @@ public class DeathListener implements Listener {
if (Objects.equals(worldString, "hardcore")){ if (Objects.equals(worldString, "hardcore")){
ButtonHardcorePlugin.hardcoreTimeDead.getScore(playername).setScore(currentTime); HelloWorldPlugin.hardcoreTimeDead.getScore(playername).setScore(currentTime);
ButtonHardcorePlugin.hardcoreInvite.getScore(playername).setScore(0); HelloWorldPlugin.hardcoreInvite.getScore(playername).setScore(0);
//player.sendMessage("death detected"); //player.sendMessage("death detected");
//player.sendMessage("hardcoreTimeDead score = " + String.valueOf(HelloWorldPlugin.hardcoreTimeDead.getScore(playername).getScore())); //player.sendMessage("hardcoreTimeDead score = " + String.valueOf(HelloWorldPlugin.hardcoreTimeDead.getScore(playername).getScore()));

View file

@ -14,8 +14,8 @@ import org.bukkit.entity.Player;
public class HelloWorld implements CommandExecutor { public class HelloWorld implements CommandExecutor {
ButtonHardcorePlugin plugin; HelloWorldPlugin plugin;
public HelloWorld(ButtonHardcorePlugin plugin){ public HelloWorld(HelloWorldPlugin plugin){
this.plugin = plugin; this.plugin = plugin;
} }
@ -41,8 +41,8 @@ public class HelloWorld implements CommandExecutor {
int currentTime = (int) ((System.currentTimeMillis())/1000); int currentTime = (int) ((System.currentTimeMillis())/1000);
int deathTime = 0; int deathTime = 0;
if (ButtonHardcorePlugin.hardcoreTimeDead.getScore(playername) != null) //null check - if score exists if (HelloWorldPlugin.hardcoreTimeDead.getScore(playername) != null) //null check - if score exists
deathTime = ButtonHardcorePlugin.hardcoreTimeDead.getScore(playername).getScore(); //set deathTime to that score deathTime = HelloWorldPlugin.hardcoreTimeDead.getScore(playername).getScore(); //set deathTime to that score

View file

@ -16,7 +16,7 @@ import alisolarflare.listeners.ConflictCompassCraftingListener;
import alisolarflare.listeners.DiamondArmorBlocker; import alisolarflare.listeners.DiamondArmorBlocker;
public class ButtonHardcorePlugin extends JavaPlugin { public class HelloWorldPlugin extends JavaPlugin {
public static Player iie; public static Player iie;
@ -51,7 +51,7 @@ public class ButtonHardcorePlugin extends JavaPlugin {
getServer().getPluginManager().registerEvents(new DiamondArmorBlocker(), this); getServer().getPluginManager().registerEvents(new DiamondArmorBlocker(), this);
getServer().getPluginManager().registerEvents(new ConflictCompassCraftingListener(), this); getServer().getPluginManager().registerEvents(new ConflictCompassCraftingListener(), this);
//getServer().getPluginManager().registerEvents(new CompassLobby(), this); getServer().getPluginManager().registerEvents(new CompassLobby(), this);
} }

View file

@ -8,8 +8,8 @@ import org.bukkit.event.player.PlayerJoinEvent;
public class JoinListener implements Listener { public class JoinListener implements Listener {
ButtonHardcorePlugin plugin; HelloWorldPlugin plugin;
public JoinListener(ButtonHardcorePlugin plugin){ public JoinListener(HelloWorldPlugin plugin){
this.plugin = plugin; this.plugin = plugin;
} }
@ -21,22 +21,22 @@ public class JoinListener implements Listener {
String playername = (String) player.getName(); String playername = (String) player.getName();
if (ButtonHardcorePlugin.hardcoreInvite.getScore(playername) == null){ //null check if (HelloWorldPlugin.hardcoreInvite.getScore(playername) == null){ //null check
ButtonHardcorePlugin.hardcoreInvite.getScore(playername).setScore(0); //convert null to 0 HelloWorldPlugin.hardcoreInvite.getScore(playername).setScore(0); //convert null to 0
} }
if (ButtonHardcorePlugin.hardcoreTimeDead.getScore(playername) == null){ //null check if (HelloWorldPlugin.hardcoreTimeDead.getScore(playername) == null){ //null check
ButtonHardcorePlugin.hardcoreTimeDead.getScore(playername).setScore(0); //convert null to 0 HelloWorldPlugin.hardcoreTimeDead.getScore(playername).setScore(0); //convert null to 0
} }
int invite = ButtonHardcorePlugin.hardcoreInvite.getScore(playername).getScore(); int invite = HelloWorldPlugin.hardcoreInvite.getScore(playername).getScore();
int deathTime = ButtonHardcorePlugin.hardcoreTimeDead.getScore(playername).getScore(); int deathTime = HelloWorldPlugin.hardcoreTimeDead.getScore(playername).getScore();
int currentTime = (int) ((System.currentTimeMillis())/1000); int currentTime = (int) ((System.currentTimeMillis())/1000);
if (currentTime - deathTime >= 86400 && deathTime != 0 && invite == 0){ if (currentTime - deathTime >= 86400 && deathTime != 0 && invite == 0){
player.sendMessage(playername + ", your death has lifted in Hardcore world. (You died " + String.valueOf((currentTime - deathTime) /3600) + " hours ago)"); player.sendMessage(playername + ", your death has lifted in Hardcore world. (You died " + String.valueOf((currentTime - deathTime) /3600) + " hours ago)");
player.sendMessage("Are you ready to give life another shot?"); player.sendMessage("Are you ready to give life another shot?");
ButtonHardcorePlugin.hardcoreInvite.getScore(playername).setScore(1); HelloWorldPlugin.hardcoreInvite.getScore(playername).setScore(1);
}else if (currentTime - deathTime <= 86400){ }else if (currentTime - deathTime <= 86400){
player.sendMessage(String.valueOf((86400 - (currentTime - deathTime)) /3600) + " hours of death remaining in hardcore"); player.sendMessage(String.valueOf((86400 - (currentTime - deathTime)) /3600) + " hours of death remaining in hardcore");
}else if (deathTime == 0){ }else if (deathTime == 0){