diff --git a/README.md b/README.md index 19cdc7a4..d3b1ad90 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,6 @@ TotalFreedomMod is a CraftBukkit server plugin designed primarily to support the [Official TotalFreedom Minecraft Server](http://totalfreedom.me/). However, you are more than welcome to adapt the source for your own server. -This plugin was originally coded by StevenLawson (Madgeek1450), with Jerom van der Sar (DarthSalamon) becoming heavily involved in its development some time later. It consists of over 85 custom coded commands and a large variety of distinguishable features not included in any other plugin. The plugin has since its beginning grown immensely. Together, with the main TotalFreedom server, TotalFreedomMod has a long-standing reputation of effectiveness whilst maintaining a clear feeling of openness towards the administrators and the players themselves. +This plugin was originally coded by StevenLawson (Madgeek1450), with Jerom van der Sar (Prozza) becoming heavily involved in its development some time later. It consists of over 85 custom coded commands and a large variety of distinguishable features not included in any other plugin. The plugin has since its beginning grown immensely. Together, with the main TotalFreedom server, TotalFreedomMod has a long-standing reputation of effectiveness whilst maintaining a clear feeling of openness towards the administrators and the players themselves. Please see [CONTRIBUTING.md](CONTRIBUTING.md) if you are interested in developing TotalFreedomMod. For information on how TotalFreedomMod is licensed, please see [LICENSE.md](LICENSE.md). diff --git a/src/bans.yml b/src/bans.yml index 742a3162..8692ffe3 100644 --- a/src/bans.yml +++ b/src/bans.yml @@ -7,7 +7,7 @@ # ips: - - '192.168.1.254:Notch:DarthSalamon:0:IP ban example' + - '192.168.1.254:Notch:Prozza:0:IP ban example' uuids: - - '245d2f30-61fb-4840-9cd3-298b3920f4a4:Cobrex:DarthSalamon:0:UUID ban example' \ No newline at end of file + - '245d2f30-61fb-4840-9cd3-298b3920f4a4:Cobrex:Prozza:0:UUID ban example' \ No newline at end of file diff --git a/src/me/StevenLawson/TotalFreedomMod/Config/TFM_Config.java b/src/me/StevenLawson/TotalFreedomMod/Config/TFM_Config.java index 52bf5688..513319a4 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Config/TFM_Config.java +++ b/src/me/StevenLawson/TotalFreedomMod/Config/TFM_Config.java @@ -43,7 +43,7 @@ public class TFM_Config extends YamlConfiguration // BukkitLib @ https://github. * *

Example: *

-     * YamlConfig config = new YamlConfig(this, new File(plugin.getDataFolder() + "/players", "DarthSalamon.yml"), false);
+     * YamlConfig config = new YamlConfig(this, new File(plugin.getDataFolder() + "/players", "Prozza.yml"), false);
      * config.load();
      * 

* diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Ban.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Ban.java index 2406588c..e17f74ed 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Ban.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Ban.java @@ -16,7 +16,7 @@ public class TFM_Ban static { - // 192.168.1.254:LocalHost:DarthSalamon:0:none + // 192.168.1.254:LocalHost:Prozza:0:none // 127.0.*.*:TestUserName:BannedByNotch:123567:Test reason IP_BAN_REGEX = Pattern.compile( "^((?:(?:\\*|(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))\\.){3}(?:\\*|(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)))" @@ -24,7 +24,7 @@ public class TFM_Ban + ":([\\w]+)" + ":(\\d+)" + ":([\\s\\S]+)$"); - // 245d2f30-61fb-4840-9cd3-298b3920f4a4:Cobrex:DarthSalamon:0:Example reason + // 245d2f30-61fb-4840-9cd3-298b3920f4a4:Cobrex:Prozza:0:Example reason UUID_BAN_REGEX = Pattern.compile( "^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})" + ":([\\w\\s]+)" diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java index 081b3de2..c23ac829 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java @@ -326,7 +326,7 @@ public class TFM_Util block.setType(Material.SKULL); final Skull skull = (Skull) block.getState(); skull.setSkullType(SkullType.PLAYER); - skull.setOwner("DarthSalamon"); + skull.setOwner("Prozza"); skull.update(); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java index ba77440f..e289b4ed 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java +++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java @@ -77,7 +77,7 @@ public class TotalFreedomMod extends JavaPlugin @Override public void onEnable() { - TFM_Log.info("Made by Madgeek1450 and DarthSalamon"); + TFM_Log.info("Made by Madgeek1450 and Prozza"); TFM_Log.info("Compiled " + buildDate + " by " + buildCreator); final TFM_Util.MethodTimer timer = new TFM_Util.MethodTimer(); diff --git a/src/superadmin.yml b/src/superadmin.yml index bfb02e6b..99d440fe 100644 --- a/src/superadmin.yml +++ b/src/superadmin.yml @@ -5,8 +5,8 @@ clean_threshold_hours: 168 admins: - b3c3b05a-a52d-33a6-a9c6-6e5063e00f0a: - last_login_name: DarthSalamon + f9a1982e-252e-4ed3-92ed-52b0506a39c9: + last_login_name: Prozza is_activated: true is_senior_admin: true is_telnet_admin: true