Compare commits

...

8 commits
iie ... master

Author SHA1 Message Date
75c7b605b4 Fixed plugin.yml inclusion 2016-10-23 12:44:39 +02:00
BuildTools
9a2787b8c5 divide zAverage by 2 2016-10-23 00:19:30 -04:00
alisolarflare
b6a8bc709b Merge pull request #5 from TBMCPlugins/Ali
Changed HelloWorldPlugin to ButtonHardcorePlugin
2016-10-23 00:13:46 -04:00
alisolarflare
4bdb9603a0 Changed HelloWorldPlugin to ButtonHardcorePlugin 2016-10-23 00:13:21 -04:00
alisolarflare
de4c5c8dbc Merge pull request #4 from TBMCPlugins/Ali
Ali
2016-10-22 22:09:50 -04:00
alisolarflare
b17822976e Removed a deadly listener 2016-10-22 22:09:20 -04:00
alisolarflare
c1bd614935 Merge remote-tracking branch 'refs/remotes/origin/master' into Ali 2016-10-22 21:14:30 -04:00
alisolarflare
f09d00fd1a Merge remote-tracking branch 'refs/remotes/origin/master' into Ali 2016-10-22 21:06:28 -04:00
8 changed files with 36 additions and 33 deletions

View file

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

15
pom.xml
View file

@ -8,13 +8,16 @@
<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>
@ -51,4 +54,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.HelloWorldPlugin; import iie.ButtonHardcorePlugin;
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 HelloWorldPlugin helloWorldPlugin; private ButtonHardcorePlugin helloWorldPlugin;
public RandomTPModule(HelloWorldPlugin helloWorldPlugin) { public RandomTPModule(ButtonHardcorePlugin helloWorldPlugin) {
this.helloWorldPlugin = helloWorldPlugin; this.helloWorldPlugin = helloWorldPlugin;
} }
@ -34,7 +34,7 @@ public class RandomTPModule{
//INIT - zDifference, zAverage //INIT - zDifference, zAverage
int zdifference = minLocation.getBlockX() - maxLocation.getBlockY(); int zdifference = minLocation.getBlockX() - maxLocation.getBlockY();
int zAverage = (int) Math.floor(minLocation.getBlockZ() + maxLocation.getBlockZ()); int zAverage = (int) Math.floor(minLocation.getBlockZ() + maxLocation.getBlockZ() / 2);
//CHECK - Reset Cycle //CHECK - Reset Cycle
if (!(northUsed || southUsed || eastUsed || westUsed)){ if (!(northUsed || southUsed || eastUsed || westUsed)){

View file

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

View file

@ -16,7 +16,7 @@ import alisolarflare.listeners.ConflictCompassCraftingListener;
import alisolarflare.listeners.DiamondArmorBlocker; import alisolarflare.listeners.DiamondArmorBlocker;
public class HelloWorldPlugin extends JavaPlugin { public class ButtonHardcorePlugin extends JavaPlugin {
public static Player iie; public static Player iie;
@ -51,7 +51,7 @@ public class HelloWorldPlugin 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

@ -11,8 +11,8 @@ import org.bukkit.event.entity.PlayerDeathEvent;
public class DeathListener implements Listener { public class DeathListener implements Listener {
HelloWorldPlugin plugin; ButtonHardcorePlugin plugin;
public DeathListener(HelloWorldPlugin plugin){ public DeathListener(ButtonHardcorePlugin 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")){
HelloWorldPlugin.hardcoreTimeDead.getScore(playername).setScore(currentTime); ButtonHardcorePlugin.hardcoreTimeDead.getScore(playername).setScore(currentTime);
HelloWorldPlugin.hardcoreInvite.getScore(playername).setScore(0); ButtonHardcorePlugin.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 {
HelloWorldPlugin plugin; ButtonHardcorePlugin plugin;
public HelloWorld(HelloWorldPlugin plugin){ public HelloWorld(ButtonHardcorePlugin 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 (HelloWorldPlugin.hardcoreTimeDead.getScore(playername) != null) //null check - if score exists if (ButtonHardcorePlugin.hardcoreTimeDead.getScore(playername) != null) //null check - if score exists
deathTime = HelloWorldPlugin.hardcoreTimeDead.getScore(playername).getScore(); //set deathTime to that score deathTime = ButtonHardcorePlugin.hardcoreTimeDead.getScore(playername).getScore(); //set deathTime to that score

View file

@ -8,8 +8,8 @@ import org.bukkit.event.player.PlayerJoinEvent;
public class JoinListener implements Listener { public class JoinListener implements Listener {
HelloWorldPlugin plugin; ButtonHardcorePlugin plugin;
public JoinListener(HelloWorldPlugin plugin){ public JoinListener(ButtonHardcorePlugin 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 (HelloWorldPlugin.hardcoreInvite.getScore(playername) == null){ //null check if (ButtonHardcorePlugin.hardcoreInvite.getScore(playername) == null){ //null check
HelloWorldPlugin.hardcoreInvite.getScore(playername).setScore(0); //convert null to 0 ButtonHardcorePlugin.hardcoreInvite.getScore(playername).setScore(0); //convert null to 0
} }
if (HelloWorldPlugin.hardcoreTimeDead.getScore(playername) == null){ //null check if (ButtonHardcorePlugin.hardcoreTimeDead.getScore(playername) == null){ //null check
HelloWorldPlugin.hardcoreTimeDead.getScore(playername).setScore(0); //convert null to 0 ButtonHardcorePlugin.hardcoreTimeDead.getScore(playername).setScore(0); //convert null to 0
} }
int invite = HelloWorldPlugin.hardcoreInvite.getScore(playername).getScore(); int invite = ButtonHardcorePlugin.hardcoreInvite.getScore(playername).getScore();
int deathTime = HelloWorldPlugin.hardcoreTimeDead.getScore(playername).getScore(); int deathTime = ButtonHardcorePlugin.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?");
HelloWorldPlugin.hardcoreInvite.getScore(playername).setScore(1); ButtonHardcorePlugin.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){