sigonasr2/TwosideKeeper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed getServerTickTime().

Browse Source
This commit is contained in:
sigonasr2 2016-07-29 21:36:14 -05:00
parent 11b8302a87
commit c9ddbb7bc7
5 changed files with 81 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

2
src/plugin.yml
View File

@ -1,6 +1,6 @@
name: TwosideKeeper
main: sig.plugin.TwosideKeeper.TwosideKeeper
version: 3.7.3-alpha2
version: 3.7.3-alpha3
commands:
money:
description: Tells the player the amount of money they are holding.

40
src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java
View File

@ -1616,6 +1616,46 @@ public class GenericFunctions {
case IRON_FENCE:{
return "Iron Bars";
}
case RAILS:{
return "Rail";
}
case COAL:{
switch (type.getDurability()) {
case 0:{
return "Coal";
}
case 1:{
return "Charcoal";
}
}
}
case COAL_BLOCK:{
return "Block of Coal";
}
case REDSTONE_BLOCK:{
return "Block of Redstone";
}
case LAPIS_BLOCK:{
return "Lapis Lazuli Block";
}
case EMERALD_BLOCK:{
return "Block of Emerald";
}
case GOLD_BLOCK:{
return "Block of Gold";
}
case IRON_BLOCK:{
return "Block of Iron";
}
case DIAMOND_BLOCK:{
return "Block of Diamond";
}
case QUARTZ:{
return "Nether Quartz";
}
case COOKED_BEEF:{
return "Steak";
}
default:{
return GenericFunctions.CapitalizeFirstLetters(type.getType().toString().replace("_", " "));
}

7
src/sig/plugin/TwosideKeeper/HelperStructures/Loot.java
View File

@ -37,7 +37,7 @@ public class Loot {
}
/*
if (GenericFunctions.isArmor(raresword)) {
raresword = GenerateSetPiece();
raresword = GenerateSetPiece(raresword);
}*/
return raresword;
}
@ -101,6 +101,11 @@ public class Loot {
return raresword;
}
ItemStack GenerateSetPiece(ItemStack item) {
return item;
}
private static int GetHardenedBreaks(Material type) {
if (type.toString().contains("STONE")) {
return (int)((Math.random()*3)+2);

40
src/sig/plugin/TwosideKeeper/TwosideKeeper.java
View File

@ -111,6 +111,7 @@ import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.event.player.PlayerAchievementAwardedEvent;
import org.bukkit.event.player.PlayerChatEvent;
import org.bukkit.event.player.PlayerChatTabCompleteEvent;
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.player.PlayerDropItemEvent;
import org.bukkit.event.player.PlayerExpChangeEvent;
import org.bukkit.event.player.PlayerFishEvent;
@ -260,6 +261,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
public static boolean restarting_server=false;
public int TeamCounter = 0;
public static int time_passed = 0; //The total amount of time lost due to modifications to FullTime().
public static List<Party> PartyList = new ArrayList<Party>();
public List<Integer> colors_used = new ArrayList<Integer>();
public static List<ChargeZombie> chargezombies = new ArrayList<ChargeZombie>();
@ -320,7 +322,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
filesave=getDataFolder(); //Store the location of where our data folder is.
log("Data folder at "+filesave+".",3);
STARTTIME=Bukkit.getWorld("world").getFullTime();
time_passed+=-Bukkit.getWorld("world").getFullTime();
LASTSERVERCHECK=getServerTickTime();
EssenceLogger = new MysteriousEssenceLogger();
@ -440,7 +442,8 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
getServer().getScheduler().scheduleSyncRepeatingTask(this, new Runnable(){
public void run(){
log("Server time passed: "+(Bukkit.getWorld("world").getFullTime()-STARTTIME)+". New Server Time: "+(Bukkit.getWorld("world").getFullTime()-STARTTIME+SERVERTICK),5);
Bukkit.getWorld("world").setFullTime(Bukkit.getWorld("world").getFullTime()-10);
//Bukkit.getWorld("world").setFullTime(Bukkit.getWorld("world").getFullTime()-10); //LEGACY CODE.
adjustServerTime(10);
//WORK IN PROGRESS: Lamp updating code TO GO HERE.
//SAVE SERVER SETTINGS.
@ -485,13 +488,16 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
if (players.size()>1) {
getServer().broadcastMessage(ChatColor.GOLD+"Enough Players sleeping! It's now morning!");
}
Bukkit.getWorld("world").setFullTime(Bukkit.getWorld("world").getFullTime()+10);
/*Bukkit.getWorld("world").setFullTime(Bukkit.getWorld("world").getFullTime()+10);
SERVERTICK=getServerTickTime();
SERVERTICK=getServerTickTime();*/
long temptime = Bukkit.getWorld("world").getFullTime();
Bukkit.getWorld("world").setTime(0);
time_passed+=temptime-Bukkit.getWorld("world").getFullTime();
Bukkit.getWorld("world").setThundering(false);
/*
STARTTIME=Bukkit.getWorld("world").getFullTime();
LASTSERVERCHECK=getServerTickTime();
LASTSERVERCHECK=getServerTickTime();*/
//Make sure we keep SERVERTICK in check.
sleepingPlayers=0;
}
@ -1125,6 +1131,21 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
return false;
}
@EventHandler(priority=EventPriority.LOW,ignoreCancelled = true)
public void onPlayerCommand(PlayerCommandPreprocessEvent ev) {
log(" "+ChatColor.DARK_GRAY+ev.getPlayer().getName()+" is Executing Command: "+ChatColor.GOLD+ev.getMessage(),3);
if (ev.getMessage().contains("/time")) {
//Attempt to set the time difference.
long temptime = Bukkit.getWorld("world").getFullTime();
Bukkit.getScheduler().scheduleSyncDelayedTask(this, new Runnable() {
@Override
public void run() {
time_passed+=temptime-Bukkit.getWorld("world").getFullTime();
}},1);
}
}
@EventHandler(priority=EventPriority.LOW,ignoreCancelled = true)
public void onServerCommand(ServerCommandEvent ev) {
log(ev.getSender().getName()+" is Executing Command: "+ev.getCommand(),3);
@ -5295,11 +5316,16 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
}
}
public static final void adjustServerTime(long amt) {
Bukkit.getWorld("world").setFullTime(Bukkit.getWorld("world").getFullTime()-amt);
time_passed+=amt;
}
public static long getServerTickTime() {
//As the SERVERTICK variable is never actually updated,
//we have to recalculate the actual value of it if we want to use it.
long time = Math.round((Bukkit.getWorld("world").getFullTime()-STARTTIME)*DAYMULT+SERVERTICK);
log("Server Tick Time: "+time,5);
long time = SERVERTICK + time_passed + Bukkit.getWorld("world").getFullTime();
log("Server Tick Time: "+time,4);
return time;
}