Compare commits

...

2 Commits

Author SHA1 Message Date
c3dff18aef Force version number change. 2018-07-04 02:35:43 -05:00
862b7399d6 Rename version to 3.X. Remove daily bot message spam. 2018-07-04 02:33:15 -05:00
5 changed files with 7 additions and 7 deletions

View File

@ -4,9 +4,9 @@
<classpathentry kind="src" path="jgrapht"/> <classpathentry kind="src" path="jgrapht"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="lib" path="D:/Documents/Test Server/plugins/AutoPluginUpdate.jar"/> <classpathentry kind="lib" path="D:/Documents/Test Server/plugins/AutoPluginUpdate.jar"/>
<classpathentry kind="lib" path="D:/Documents/Test Server/plugins/GlowAPI_v1.4.4.jar"/> <classpathentry kind="lib" path="D:/Documents/GlowAPI_v1.4.4.jar"/>
<classpathentry kind="lib" path="D:/Documents/Test Server/spigot-1.9.2-R0.1-SNAPSHOT.jar"/> <classpathentry kind="lib" path="D:/Documents/Test Server/spigot-1.9.2-R0.1-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="D:/Documents/Test Server/plugins/aPlugin (102).jar"/> <classpathentry kind="lib" path="D:/Documents/aPlugin.jar"/>
<classpathentry kind="src" path="/AutoPluginUpdate"/> <classpathentry kind="src" path="/AutoPluginUpdate"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

Binary file not shown.

View File

@ -1,6 +1,6 @@
name: TwosideKeeper name: TwosideKeeper
main: sig.plugin.TwosideKeeper.TwosideKeeper main: sig.plugin.TwosideKeeper.TwosideKeeper
version: 3.12.2a version: 3.X
loadbefore: [aPlugin] loadbefore: [aPlugin]
commands: commands:
money: money:

View File

@ -25,7 +25,7 @@ public class DropDeathItems implements Runnable{
this.p=p; this.p=p;
this.deathloc=deathloc; this.deathloc=deathloc;
this.contents=contents; this.contents=contents;
this.inv_contents = Bukkit.createInventory(p, 63); this.inv_contents = Bukkit.createInventory(p, 63);
for (ItemStack it : contents) { for (ItemStack it : contents) {
if (it!=null) { if (it!=null) {
inv_contents.addItem(it); inv_contents.addItem(it);

View File

@ -110,7 +110,7 @@ final public class runServerHeartbeat implements Runnable {
if (TwosideKeeper.SERVER_TYPE!=ServerType.QUIET) { if (TwosideKeeper.SERVER_TYPE!=ServerType.QUIET) {
DecimalFormat df = new DecimalFormat("0.00"); DecimalFormat df = new DecimalFormat("0.00");
DecimalFormat df2 = new DecimalFormat("0"); DecimalFormat df2 = new DecimalFormat("0");
aPlugin.API.discordSendRaw("*The Deal of the Day has been updated!*\n **"+GenericFunctions.UserFriendlyMaterialName(TwosideKeeper.DEAL_OF_THE_DAY_ITEM)+"** ~~$"+df.format(WorldShop.getBaseWorldShopPrice(TwosideKeeper.DEAL_OF_THE_DAY_ITEM))+"~~ $"+df.format(WorldShop.getBaseWorldShopPrice(TwosideKeeper.DEAL_OF_THE_DAY_ITEM)*(1-TwosideKeeper.DEAL_OF_THE_DAY_PCT))+" **"+df2.format(TwosideKeeper.DEAL_OF_THE_DAY_PCT*100)+"% Off!**"); //aPlugin.API.discordSendRaw("*The Deal of the Day has been updated!*\n **"+GenericFunctions.UserFriendlyMaterialName(TwosideKeeper.DEAL_OF_THE_DAY_ITEM)+"** ~~$"+df.format(WorldShop.getBaseWorldShopPrice(TwosideKeeper.DEAL_OF_THE_DAY_ITEM))+"~~ $"+df.format(WorldShop.getBaseWorldShopPrice(TwosideKeeper.DEAL_OF_THE_DAY_ITEM)*(1-TwosideKeeper.DEAL_OF_THE_DAY_PCT))+" **"+df2.format(TwosideKeeper.DEAL_OF_THE_DAY_PCT*100)+"% Off!**");
//MessageUtils.announceMessage("The Deal of the Day has been updated!"); //MessageUtils.announceMessage("The Deal of the Day has been updated!");
} }
for (Player p : Bukkit.getOnlinePlayers()) { for (Player p : Bukkit.getOnlinePlayers()) {
@ -121,7 +121,7 @@ final public class runServerHeartbeat implements Runnable {
if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK)==Calendar.SUNDAY && TwosideKeeper.LAST_WEEKLY_RESET+6912000<=TwosideKeeper.getServerTickTime()) { if (Calendar.getInstance().get(Calendar.DAY_OF_WEEK)==Calendar.SUNDAY && TwosideKeeper.LAST_WEEKLY_RESET+6912000<=TwosideKeeper.getServerTickTime()) {
TwosideKeeper.LAST_WEEKLY_RESET = TwosideKeeper.getServerTickTime(); TwosideKeeper.LAST_WEEKLY_RESET = TwosideKeeper.getServerTickTime();
aPlugin.API.discordSendRaw("__**Last Week's Challenge Standings**__ *(Use !daily to see Hall of Fame)*"); //aPlugin.API.discordSendRaw("__**Last Week's Challenge Standings**__ *(Use !daily to see Hall of Fame)*");
if (TwosideKeeper.dpschallenge_records.recordlist.size()>0) { if (TwosideKeeper.dpschallenge_records.recordlist.size()>0) {
TwosideKeeper.dpschallenge_records.announceRecords(); TwosideKeeper.dpschallenge_records.announceRecords();
} }
@ -132,7 +132,7 @@ final public class runServerHeartbeat implements Runnable {
TwosideKeeper.parkourchallenge_records.announceRecords(); TwosideKeeper.parkourchallenge_records.announceRecords();
} }
aPlugin.API.discordSendRawItalicized("All Weekly Challenge Leaderboards have been reset!"); //aPlugin.API.discordSendRawItalicized("All Weekly Challenge Leaderboards have been reset!");
TwosideKeeper.dpschallenge_records.resetRecords(); TwosideKeeper.dpschallenge_records.resetRecords();
TwosideKeeper.tankchallenge_records.resetRecords(); TwosideKeeper.tankchallenge_records.resetRecords();
TwosideKeeper.parkourchallenge_records.resetRecords(); TwosideKeeper.parkourchallenge_records.resetRecords();