From cf5199f28eab399a9a081f2980d3f821f8d5bdeb Mon Sep 17 00:00:00 2001 From: Video Date: Mon, 21 Feb 2022 16:45:03 -0700 Subject: [PATCH] Squashed commit of the following: commit 43c68579e54e6029f8e82ffa354f9ca2ff4c4e63 Merge: 2618d97a b711ed51 Author: elmon Date: Mon Feb 21 10:01:39 2022 +0100 Merge pull request #190 from AtlasMediaGroup/Elmon11-patch-2 order of messages fix commit b711ed517f25156e24e2229262d36ed0bb014ed8 Merge: 1c464729 2618d97a Author: elmon Date: Mon Jan 24 22:16:24 2022 +0100 Merge branch 'development' into Elmon11-patch-2 commit 2618d97a3ecc9a066ef44bfd9ed298ed11a0505f Author: Nathan Curran <30569566+Focusvity@users.noreply.github.com> Date: Mon Jan 24 12:42:47 2022 +1100 Remove requireNonNull method from getIp, which causes NPE - resolves FS-429 (#187) Co-authored-by: Paldiu commit 1c4647290a9101516f0d5501694359bf3ed00183 Merge: f00f67a8 850f1210 Author: Nathan Curran <30569566+Focusvity@users.noreply.github.com> Date: Mon Jan 24 12:41:47 2022 +1100 Merge branch 'development' into Elmon11-patch-2 commit f00f67a844156836041b53b48cdad527b63f887a Author: elmon Date: Sun Jan 23 13:26:22 2022 +0100 order of messages fix https://media.discordapp.net/attachments/874713176082636882/934559012991680532/unknown.png commit 850f12103c701fbd3f8034d924ebc3ce5d6cb5f4 Merge: 2eb0ab4c 7fd77f3c Author: Paldiu Date: Mon Jan 17 11:35:09 2022 -0600 Merge pull request #188 from AtlasMediaGroup/Wild1145-patch-1 Correct CoreProtect Version commit 7fd77f3cbb7bd8bfb9286f42f113fd9ea1ef99a8 Author: Ryan Date: Sun Jan 16 18:22:16 2022 +0000 Correct CoreProtect Version To align with the version running on Freedom-01 at the moment. commit 2eb0ab4cb1d5ebcea0b5e26870b2a36327a87b3a Merge: 8cff0124 2612aaec Author: Video Date: Wed Dec 22 20:56:46 2021 -0700 Merge pull request #179 from AtlasMediaGroup/FS-212 Makes spawnmob configurable, increases the default limit to 25 (FS-212) commit 2612aaec31d6b372fec85b86d608ce2b74bb9463 Author: Video Date: Wed Dec 15 21:46:56 2021 -0700 Makes spawnmob configurable and increases the default limit to 25 commit 8cff0124eaf4da1ae7bb3377845302e54c8ac73e Merge: 35965b0b 1162f10e Author: Video Date: Mon Nov 29 06:36:20 2021 -0700 Merge pull request #93 from AtlasMediaGroup/FS-37 Fixes FS-37 commit 1162f10ebb1c3b3428c315354bbdd9c670d125fe Merge: 7ce173e0 35965b0b Author: Video Date: Mon Nov 29 06:31:18 2021 -0700 Merge branch 'development' into FS-37 commit 35965b0b1076273e8a16247694802cb427622e1d Merge: aa20a6e5 1253732f Author: Video Date: Mon Nov 29 06:31:11 2021 -0700 Merge pull request #174 from AtlasMediaGroup/FS-256 Forces the server to recalculate the permissions server-wide in /opall (FS-256) commit 1253732f7740ff5ad656d4f9d7e0354a7466f69e Merge: e1bee321 aa20a6e5 Author: Video Date: Mon Nov 29 06:25:25 2021 -0700 Merge branch 'development' into FS-256 commit 7ce173e02b28a76f3d900c75bb18166714a28cc7 Merge: 4d006ed1 aa20a6e5 Author: Video Date: Mon Nov 29 06:24:34 2021 -0700 Merge branch 'development' into FS-37 commit aa20a6e579cb1cc147d231d65891b911fbf25a08 Merge: 70622900 1ecfb0b0 Author: Video Date: Mon Nov 29 06:23:57 2021 -0700 Merge pull request #129 from AtlasMediaGroup/FS-7 Allow players to pay other players coins [FS-7] commit e1bee32163aa015d6d61b9d6a019a261c6602731 Author: Video Date: Mon Nov 29 03:27:07 2021 -0700 Forces the server to recalculate the permissions server-wide in /opall commit 4d006ed172a31b05730930a26275280d1de04e01 Merge: 8cbfde8b 70622900 Author: Video Date: Mon Nov 29 03:04:42 2021 -0700 Merge branch 'development' into FS-37 commit 1ecfb0b0660d88c3f8223dc80cd127891fa51dbf Merge: 225ade87 70622900 Author: Video Date: Mon Nov 29 03:01:22 2021 -0700 Merge branch 'development' into FS-7 commit 706229004c50c26b4cd2bf4fcbe5a7a889cf7b63 Merge: a42cb6af a4adfa9b Author: Video Date: Mon Nov 29 03:00:15 2021 -0700 Merge pull request #131 from AtlasMediaGroup/FS-273 Moves /rainbowtrail to the shop (FS-273) commit a4adfa9beea2d6204465209e71029500c6467052 Merge: 1b5bbd1c a42cb6af Author: Video Date: Mon Nov 29 02:46:41 2021 -0700 Merge branch 'development' into FS-273 commit 225ade87533d11daeef38231fcd6a4cb5bda36ec Merge: afe755f5 a42cb6af Author: Video Date: Mon Nov 29 02:46:02 2021 -0700 Merge branch 'development' into FS-7 commit 8cbfde8bbc9e321b856a4cc72c0d827af1b09627 Merge: bba5ec92 a42cb6af Author: Video Date: Mon Nov 29 02:41:49 2021 -0700 Merge branch 'development' into FS-37 commit a42cb6aff98f97469202f686f67c010fffe8bc2c Merge: 2ecfb886 01fdf766 Author: Video Date: Mon Nov 29 02:41:34 2021 -0700 Merge pull request #125 from AtlasMediaGroup/shitcan-savedflags Shitcans SavedFlags commit 01fdf766ee831bd4f9ae1b887b75b559e1171bd7 Merge: 58c21bb1 2ecfb886 Author: Video Date: Tue Nov 23 09:28:48 2021 -0700 Merge branch 'development' into shitcan-savedflags commit afe755f5c1406804f10ed221fd9365f736168610 Merge: 5f97e68e 2ecfb886 Author: Video Date: Tue Nov 23 09:26:59 2021 -0700 Merge branch 'development' into FS-7 commit 5f97e68e0eb02a2037c9239d9a466d0124efd4ac Author: Video Date: Tue Nov 23 09:26:49 2021 -0700 fuck it, it works commit 1b5bbd1c05b38a3af14a51842f96b54ab141710d Merge: 8356e831 2ecfb886 Author: Video Date: Tue Nov 23 09:16:21 2021 -0700 Merge branch 'development' into FS-273 commit 2ecfb88604dcea061b1fb142f18ca2becec8cfef Merge: 42143c11 bb2ddf11 Author: Video Date: Tue Nov 23 09:15:16 2021 -0700 Merge pull request #130 from AtlasMediaGroup/FS-215 Makes [Discord] a hyperlink (FS-215) commit 8356e831a5188b9bdae36e3672cd3d96919111c0 Author: Video Date: Tue Nov 23 09:11:16 2021 -0700 Redundancy fix and better protection system commit ab00cb840fbb3b0aa92f7ab952776b5d6793ab6a Merge: ecce62f6 42143c11 Author: Video Date: Tue Nov 23 03:31:45 2021 -0700 Merge branch 'development' into FS-273 commit bb2ddf11292cb0945d7be2c5cd012cd96aee40ff Merge: cf9fdc6f 42143c11 Author: Video Date: Tue Nov 23 03:31:19 2021 -0700 Merge branch 'development' into FS-215 commit bba5ec922b8eab37eeb8c356145cf265f717dbdf Merge: 68adaed9 42143c11 Author: Video Date: Tue Nov 23 03:31:13 2021 -0700 Merge branch 'development' into FS-37 commit 58c21bb1aab8b80829663343a9677cfd79d09e19 Merge: fdba119d 42143c11 Author: Video Date: Tue Nov 23 03:30:48 2021 -0700 Merge branch 'development' into shitcan-savedflags commit 68adaed9977f8277796350859acdb221da4290aa Merge: 087b8dd7 a598c933 Author: Video Date: Sat Oct 9 00:09:24 2021 -0600 Merge branch 'development' into FS-37 commit ecce62f6b4dc3641d7a66a37b226305d44c938d0 Merge: d8148530 a598c933 Author: Video Date: Sat Oct 9 00:01:22 2021 -0600 Merge branch 'development' into FS-273 commit cf9fdc6fe4fc278c5cc46745f535bdb7dfce185b Merge: 387ea6f7 a598c933 Author: Video Date: Fri Oct 8 01:43:33 2021 -0600 Merge branch 'development' into FS-215 commit 387ea6f71e36dddcd376ac0f6a555e30a9735067 Merge: a1ecf881 180cd811 Author: Video Date: Fri Oct 1 00:35:12 2021 -0600 Merge branch 'development' into FS-215 commit d81485303659656a1f1c215d3b505b6a7e63925f Merge: 47e63869 213a4338 Author: Ryan Date: Sun Sep 12 13:49:05 2021 +0100 Merge branch 'development' into FS-273 commit a1ecf881094de1da26b181370d08bddb425b4e98 Merge: bd647afe 213a4338 Author: Ryan Date: Sun Sep 12 13:48:59 2021 +0100 Merge branch 'development' into FS-215 commit 5a6a5ff75de1662aeccddbe25d62c44dc748a565 Merge: 6ca61d9c 213a4338 Author: Ryan Date: Sun Sep 12 13:48:50 2021 +0100 Merge branch 'development' into FS-7 commit fdba119d5d7b016a9fddaa05568776f43d02d442 Merge: 61857dd0 213a4338 Author: Ryan Date: Sun Sep 12 13:48:44 2021 +0100 Merge branch 'development' into shitcan-savedflags commit 087b8dd7eaddfb0f33a1288e0f5442eb3a45b392 Merge: 3818aab4 213a4338 Author: Ryan Date: Sun Sep 12 13:48:21 2021 +0100 Merge branch 'development' into FS-37 commit 3818aab454dcd72c0c64f3c6e4710fb3e0f94643 Merge: caeda219 0e12f5e7 Author: Video Date: Sun Sep 12 03:04:08 2021 -0600 Merge branch 'development' into FS-37 commit 61857dd06f05f1ba7242f308de671ea65f33ca80 Merge: 2d18d461 0e12f5e7 Author: Video Date: Sun Sep 12 03:01:37 2021 -0600 Merge branch 'development' into shitcan-savedflags commit bd647afe92d21e9dff65ae9c4c07323f56bfd1cd Merge: 69f17ef2 0e12f5e7 Author: Video Date: Sun Sep 12 02:50:39 2021 -0600 Merge branch 'development' into FS-215 commit 69f17ef2d742cfc77bc659c21fa0ef3007ab2337 Merge: ee1b27fa aebe1ace Author: Video Date: Sun Sep 12 02:01:56 2021 -0600 Merge branch 'development' into FS-215 commit caeda219fa38e646111d73d0be08c34d52e6d973 Merge: 3ca98352 0a9b95bf Author: Ryan Date: Sat Sep 11 15:26:37 2021 +0100 Merge branch 'development' into FS-37 commit ee1b27fa0df9ee1b579ce4ea6e0f768bb1ac7ca4 Merge: 2bdf14f3 0a9b95bf Author: Ryan Date: Sat Sep 11 01:24:00 2021 +0100 Merge branch 'development' into FS-215 commit 6ca61d9c6c506f7532290bb6e2d5a5f484f0e36c Merge: fedf80b8 0a9b95bf Author: Ryan Date: Sat Sep 11 01:23:52 2021 +0100 Merge branch 'development' into FS-7 commit 2d18d461fea83aef743967e10f8c6d6afd67a09c Merge: a4c81f20 0a9b95bf Author: Ryan Date: Sat Sep 11 01:23:44 2021 +0100 Merge branch 'development' into shitcan-savedflags commit 47e638690731402f3f859168ad3eb601608b38bf Merge: b1062fbb 0a9b95bf Author: Ryan Date: Sat Sep 11 01:23:13 2021 +0100 Merge branch 'development' into FS-273 commit fedf80b834dc02d4a2ea5676224643906b661235 Merge: a2d11d4b 44ff621d Author: Video Date: Fri Sep 10 01:39:16 2021 -0600 Merge branch 'development' into FS-7 commit 2bdf14f38c07c70e392879e2c18be02e0c847af2 Merge: f6d46b61 44ff621d Author: Video Date: Mon Sep 6 15:26:13 2021 -0600 Merge branch 'development' into FS-215 commit b1062fbb6c8587317cc5c107da0357873559e0a3 Merge: f69feed4 44ff621d Author: Video Date: Mon Sep 6 14:39:32 2021 -0600 Merge branch 'development' into FS-273 commit 3ca98352570943ebfec3801d0d95e7b7d7b51446 Merge: da82b270 54cb0cfa Author: Video Date: Mon Sep 6 01:16:04 2021 -0600 Merge branch 'development' into FS-37 commit f69feed469da5cb1852e96b68b742f261a3652ff Author: Video Date: Mon Sep 6 01:14:21 2021 -0600 fixed commit 8253f94ac4d71e068d687c87c76bdba13a9b6553 Merge: daf0126f 54cb0cfa Author: Video Date: Mon Sep 6 01:12:00 2021 -0600 Merge branch 'development' into FS-273 commit a4c81f202cd041d4f084135bbd9b0a1d77cd6505 Merge: 0d09c3a5 23caa4e8 Author: Ryan Date: Sat Sep 4 01:23:06 2021 +0100 Merge branch 'development' into shitcan-savedflags commit da82b2701633359b9129f9bcd4944b7a2bbb7d83 Merge: af1df228 23caa4e8 Author: Ryan Date: Sat Sep 4 01:07:55 2021 +0100 Merge branch 'development' into FS-37 commit daf0126f4560c9c75f68e3e302f4fb2b41bd7dd3 Merge: a51f5c9b 23caa4e8 Author: Ryan Date: Sat Sep 4 01:07:39 2021 +0100 Merge branch 'development' into FS-273 commit f6d46b6178a9c135df11b5305ba6fb16404381c5 Merge: ee804d52 23caa4e8 Author: Ryan Date: Sat Sep 4 01:07:33 2021 +0100 Merge branch 'development' into FS-215 commit a2d11d4b939b524bfebef20dd79ac0476e80de91 Merge: dc490659 23caa4e8 Author: Ryan Date: Sat Sep 4 01:07:28 2021 +0100 Merge branch 'development' into FS-7 commit a51f5c9bbfae2665b229e6ffff267ddbe9a956d4 Author: Video Date: Fri Sep 3 13:53:33 2021 -0600 FS-273 commit ee804d52ff0747fdf67398b12080f708460b402c Author: Video Date: Fri Sep 3 12:52:15 2021 -0600 Makes [Discord] a hyperlink (FS-215) I've decided to overhaul the implementation of DiscordToMinecraftListener to make it more easily workable. This overhaul allows me to implement FS-215 more easily. commit dc490659c11f728c99584e591f79ddd61d11b4e8 Author: Video Date: Fri Sep 3 00:07:20 2021 -0600 Begins implementing FS-7 should be good enough, but feedback would be lovely commit 0d09c3a550eb014793cc800021a0064aaad5e3b1 Merge: e2ccd14e 4c3f188b Author: Ryan Date: Sun Aug 29 20:09:03 2021 +0100 Merge branch 'development' into shitcan-savedflags commit e2ccd14eb383844c1bfb5d0e56e7924bb47f5997 Author: Video Date: Fri Aug 27 16:54:55 2021 -0600 Unsaves SavedFlags commit af1df22812661191801d95d024c3607c1fa14115 Merge: 1474a808 f380898b Author: Video Date: Thu Aug 26 23:05:58 2021 -0600 Merge branch 'development' into FS-37 commit 1474a808750215bf40481f6227c8eb5c6dc7d437 Merge: 77fd4ff6 f45466ee Author: Ryan Date: Thu Aug 26 13:26:44 2021 +0100 Merge branch 'development' into FS-37 commit 77fd4ff66ae09c535b857bfa53997b96487e3f9a Merge: 33aca2a4 d901cbaa Author: Ryan Date: Sat Aug 21 21:34:04 2021 +0100 Merge branch 'development' into FS-37 commit 33aca2a482c013debe9bab5467981ebdafdc1d4e Merge: 159eda73 0582c2e5 Author: Video Date: Tue Aug 10 22:38:51 2021 -0600 Merge branch 'development' into FS-37 commit 159eda73a1389f1e33a4e6bb948de50a6c09423f Merge: da2d2525 6874b2ce Author: Ryan Date: Tue Aug 10 17:34:12 2021 +0100 Merge branch 'development' into FS-37 commit da2d25252b996605434f29fa7660de6e772e3c80 Merge: e99aaa2e c8a4382a Author: Ryan Date: Tue Aug 10 17:31:13 2021 +0100 Merge branch 'development' into FS-37 commit e99aaa2eb4665aac0686d029774d604dc3118279 Author: Video Date: Thu Aug 5 00:32:23 2021 -0600 Fixes FS-37 Fixes an oversight introduced in https://github.com/AtlasMediaGroup/TotalFreedomMod/commit/76bb2d08acb9a56a845377e2106a8f7e2d8a0750 in which the configuration is loaded twice. --- .../totalfreedommod/TotalFreedomMod.java | 1 - .../totalfreedommod/command/Command_mute.java | 18 ++++++++++-------- .../command/Command_spawnmob.java | 7 +++++-- .../totalfreedommod/config/ConfigEntry.java | 2 ++ .../totalfreedommod/util/FUtil.java | 2 +- src/main/resources/config.yml | 4 ++++ 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java b/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java index 1bb8207b..e5593b91 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java @@ -186,7 +186,6 @@ public class TotalFreedomMod extends JavaPlugin fsh = new FreedomServiceHandler(); config = new MainConfig(); - config.load(); if (FUtil.inDeveloperMode()) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mute.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mute.java index 0ce530d4..e66c0c73 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mute.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mute.java @@ -130,17 +130,19 @@ public class Command_mute extends FreedomCommand { playerdata.setMuted(true); player.sendTitle(ChatColor.RED + "You've been muted.", ChatColor.YELLOW + "Be sure to follow the rules!", 20, 100, 60); + + if (quiet) + { + msg("Muted " + player.getName() + " quietly"); + return true; // doesn't announce reason + } + + FUtil.adminAction(sender.getName(), "Muting " + player.getName(), true); + if (reason != null) { msg(player, ChatColor.RED + "Reason: " + ChatColor.YELLOW + reason); } - if (quiet) - { - msg("Muted " + player.getName() + " quietly"); - return true; - } - - FUtil.adminAction(sender.getName(), "Muting " + player.getName(), true); if (smite) { @@ -178,4 +180,4 @@ public class Command_mute extends FreedomCommand return Collections.emptyList(); } -} \ No newline at end of file +} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_spawnmob.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_spawnmob.java index 5306ceda..2ef26e69 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_spawnmob.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_spawnmob.java @@ -1,6 +1,8 @@ package me.totalfreedom.totalfreedommod.command; import java.util.List; + +import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.rank.Rank; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.EnumUtils; @@ -55,6 +57,7 @@ public class Command_spawnmob extends FreedomCommand return true; } + int max = ConfigEntry.SPAWNMOB_MAX.getInteger(); int amount = 1; if (args.length > 1) { @@ -69,9 +72,9 @@ public class Command_spawnmob extends FreedomCommand } } - if (amount > 10 || amount < 1) + if (amount > max || amount < 1) { - msg("Invalid amount: " + args[1] + ". Must be 1-10.", ChatColor.RED); + msg("Invalid amount: " + args[1] + ". Must be 1-" + max + ".", ChatColor.RED); return true; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java b/src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java index 86fb22a3..4d336882 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java @@ -45,6 +45,8 @@ public enum ConfigEntry MOB_LIMITER_DISABLE_GIANT(Boolean.class, "moblimiter.disable.giant"), MOB_LIMITER_DISABLE_SLIME(Boolean.class, "moblimiter.disable.slime"), // + SPAWNMOB_MAX(Integer.class, "spawnmob.max"), + // HTTPD_ENABLED(Boolean.class, "httpd.enabled"), HTTPD_HOST(String.class, "httpd.host"), HTTPD_PORT(Integer.class, "httpd.port"), diff --git a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java index ea7a7344..f6988aec 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java @@ -752,7 +752,7 @@ public class FUtil public static String getIp(Player player) { - return Objects.requireNonNull(player.getAddress()).getAddress().getHostAddress().trim(); + return player.getAddress().getAddress().getHostAddress().trim(); } public static String getIp(PlayerLoginEvent event) diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index b8dbaaf2..33b4b43e 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -509,6 +509,10 @@ moblimiter: slime: true giant: true +# Spawnmob +spawnmob: + max: 25 + # Flatlands flatlands: generate: true