From 551a0b231746c4a11fd72222ff67da0f18ce0485 Mon Sep 17 00:00:00 2001
From: ZeroEpoch1969 <13510767+ZeroEpoch1969@users.noreply.github.com>
Date: Wed, 25 Jul 2018 22:22:19 -0700
Subject: [PATCH] Even more 1.13 things
---
TotalFreedomMod.iml | 4 ++--
.../totalfreedommod/GameRuleHandler.java | 4 +++-
.../totalfreedommod/command/Command_myadmin.java | 7 ++++++-
.../totalfreedommod/rank/RankManager.java | 12 ++++++++++--
4 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/TotalFreedomMod.iml b/TotalFreedomMod.iml
index bde08f98..bd627a8e 100644
--- a/TotalFreedomMod.iml
+++ b/TotalFreedomMod.iml
@@ -13,7 +13,7 @@
-
+
@@ -45,7 +45,7 @@
-
+
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/GameRuleHandler.java b/src/main/java/me/totalfreedom/totalfreedommod/GameRuleHandler.java
index 45248bf1..8df9ba7c 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/GameRuleHandler.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/GameRuleHandler.java
@@ -36,6 +36,7 @@ public class GameRuleHandler extends FreedomService
setGameRule(GameRule.COMMAND_BLOCK_OUTPUT, false);
setGameRule(GameRule.NATURAL_REGENERATION, true, false);
setGameRule(GameRule.KEEP_INVENTORY, true, false);
+ setGameRule(GameRule.ANNOUNCE_ADVANCEMENTS, false, false);
commitGameRules();
}
@@ -94,7 +95,8 @@ public class GameRuleHandler extends FreedomService
DO_TILE_DROPS("doTileDrops", true),
COMMAND_BLOCK_OUTPUT("commandBlockOutput", true),
NATURAL_REGENERATION("naturalRegeneration", true),
- DO_DAYLIGHT_CYCLE("doDaylightCycle", true);
+ DO_DAYLIGHT_CYCLE("doDaylightCycle", true),
+ ANNOUNCE_ADVANCEMENTS("announceAdvancements", false);
//
private final String gameRuleName;
private final boolean defaultValue;
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java
index 642e096f..89cf5df3 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java
@@ -142,10 +142,15 @@ public class Command_myadmin extends FreedomCommand
}
String msg = StringUtils.join(args, " ", 1, args.length);
+ if (!msg.contains("%name%"))
+ {
+ msg("You login message must contain your name. To add it, specify %name% where you want it.", ChatColor.RED);
+ return true;
+ }
FUtil.adminAction(sender.getName(), "Setting personal login message" + (init == null ? "" : " for " + targetPlayer.getName()), false);
target.setLoginMessage(msg);
msg((init == null ? "Your" : targetPlayer.getName() + "'s") + " login message is now: ");
- msg("> " + ChatColor.AQUA + targetPlayer.getName() + " is " + ChatUtils.colorize(target.getLoginMessage()));
+ msg("> " + FUtil.colorize(msg).replace("%name%", targetPlayer.getName()));
plugin.al.save();
plugin.al.updateTables();
return true;
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java b/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java
index aea9df60..243ff570 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java
@@ -175,7 +175,15 @@ public class RankManager extends FreedomService
FUtil.bcastMsg(ChatColor.AQUA + player.getName() + " is " + Rank.IMPOSTOR.getColoredLoginMessage());
if (plugin.al.isAdminImpostor(player))
{
- FUtil.bcastMsg("Warning: " + player.getName() + " has been flagged as an impostor and has been frozen!", ChatColor.RED);
+ FUtil.bcastMsg("Warning: " + player.getName() + " has been flagged as an admin impostor and has been frozen!", ChatColor.RED);
+ }
+ else if (plugin.mbl.isMasterBuilderImpostor(player))
+ {
+ FUtil.bcastMsg("Warning: " + player.getName() + " has been flagged as a Master Builder impostor and has been frozen!", ChatColor.RED);
+ }
+ else if (plugin.pv.isPlayerImpostor(player))
+ {
+ FUtil.bcastMsg("Warning: " + player.getName() + " has been flagged as a player impostor and has been frozen!", ChatColor.RED);
}
String displayName = Rank.IMPOSTOR.getColor() + player.getName();
player.setPlayerListName(StringUtils.substring(displayName, 0, 16));
@@ -202,7 +210,7 @@ public class RankManager extends FreedomService
}
}
- FUtil.bcastMsg(ChatColor.AQUA + player.getName() + " is " + loginMsg);
+ FUtil.bcastMsg(loginMsg.replace("%name%", player.getName()));
plugin.pl.getPlayer(player).setTag(display.getColoredTag());
if (isAdmin)