Commit graph

263 commits

Author SHA1 Message Date
Lemon 4da29d5c9d
more h 2018-06-03 02:16:42 +05:00
Lemon 57e7fe13cf
h 2018-06-03 02:15:18 +05:00
Mafrans 6c5ae5d7d7 Merge remote-tracking branch 'origin/TFM1.12-Alpha' into TFM1.12-Alpha 2018-06-02 23:10:36 +02:00
Mafrans a6584eaa9d Fix my own shitty formatting 2018-06-02 23:09:58 +02:00
Lemon 7228180f4b
let's keep it in sync 2018-06-03 02:03:50 +05:00
Mafrans d38d780887 Merge branch 'TFM1.12-Alpha' of https://github.com/TFPatches/TotalFreedomMod into TFM1.12-Alpha 2018-06-02 23:01:24 +02:00
ZeroEpoch1969 b44d08eb55
*sigh* 2018-06-02 13:45:05 -07:00
ZeroEpoch1969 c835d38b7c
attempting to make good codes at 3 in the morning isnt very bright 2018-06-02 13:08:35 -07:00
Telesphoreo 7026423e8e TotalFreedomMod 5.2 God (#69) 2018-06-02 01:18:28 -07:00
ZeroEpoch1969 435898550b
Lemon at least make sure it compiles 2018-06-01 23:13:52 -07:00
ZeroEpoch1969 100e155fe0
What 2018-06-01 22:38:01 -07:00
ZeroEpoch1969 b8f4119924
Bring changes from the official repo over to here 2018-06-01 22:36:37 -07:00
Lemon 6647088429
why did that not push 2018-06-02 03:40:25 +05:00
Lemon 4cf338bfb5
add customization of admin format 2018-06-02 03:39:52 +05:00
Lemon 56b712729a
might as well shorten that 2018-06-02 02:28:44 +05:00
Mafrans 713ec7c8d9 Add a command that shows social media links.
Resolves #67
2018-06-01 19:35:48 +02:00
Nathan Curran ee7dbd56da Resolves TFPatches/TotalFreedomMod#57 (#66)
After a bit of recreating the PlayerVerification system, it will work now.
2018-06-01 19:13:40 +05:00
Seth 45bda95a75
yes 2018-06-01 02:42:50 -06:00
ZeroEpoch1969 aad947a354
Small problem 2018-05-29 14:30:29 -07:00
ZeroEpoch1969 f82f3932b9
Ya missed somethin there 2018-05-26 14:01:53 -07:00
Lemon 6e7297e48f
add .java
*cough cough* @ZeroEpoch1969 check PR's before merging them, also the formatting is off
2018-05-26 13:56:19 +05:00
Super_ bdae2b7b54 /cookie returns (#65) 2018-05-25 23:11:55 -07:00
ZeroEpoch1969 f7f6c47a1a
Some color changes 2018-05-24 16:25:22 -07:00
Super_ ff3f9f0a66 /potspy saving (#64) 2018-05-22 16:01:24 -07:00
ZeroEpoch1969 baf367b003
Allow telnets to verify master builders, and mb httpd addition. 2018-05-21 19:49:03 -07:00
ZeroEpoch1969 69e82b5746
Remove updater fully and revert /tfm properly. 2018-05-21 19:32:28 -07:00
Lemon 6e3fa2d6dd
let's not break the license shall we
update wasn't used anyway
2018-05-22 00:44:18 +05:00
ZeroEpoch1969 94b7e138d7
oh no 2018-05-18 19:10:18 -07:00
ZeroEpoch1969 40362eb790
Increase WorldEdit limit 2018-05-18 19:08:08 -07:00
ZeroEpoch1969 1ff7d7c8cc
Remove range bans and add mbworld alias 2018-05-17 17:46:20 -07:00
Nathan Curran 7b1a8cb527 Added some missing stuff for MB World (#61)
* Added some missing stuff for MB World

* Fix isExecutive method
2018-05-14 23:11:24 -07:00
ZeroEpoch1969 6853baebdd
Master Builder world 2018-05-13 12:49:13 -07:00
ZeroEpoch1969 1371e23d59
Master builder title, resolves #36 2018-05-11 20:09:23 -07:00
ZeroEpoch1969 83017e518d
Removed some things 2018-04-29 13:06:56 -07:00
Pramire 34a8e7f912 Make the expel command senior only (#56) 2018-04-21 19:34:34 -07:00
ZeroEpoch1969 ffbe71f5dd
Old admin mode and commandspy saving 2018-04-19 07:29:19 -07:00
Lemon 200a856413
allow admins to see eachothers command's 2018-04-12 23:15:16 +05:00
Seth b402987e41
Update FUtil.java 2018-04-01 20:51:57 -06:00
untuned f23818a9f9 fix invsee offhand bug (#52)
https://i.untuned.me/jndoUt.png
chest size can only be a multiple of 9, it was set to 1
2018-03-30 09:58:19 +05:00
Nathan Curran a8e39e3db2 Actually use the admin's personal tag if available (#51) 2018-03-28 15:37:40 +05:00
Lemon dec237db9f
don't unfreeze player impostors either 2018-03-27 12:08:57 +05:00
Lemon a63681d4a3 Improvements 2018-03-26 16:26:21 +05:00
ZeroEpoch1969 affe77c203
Lemon went too fast 2018-03-25 17:12:47 -07:00
ZeroEpoch1969 1080893be4
No more waiting for windows to update TFM 2018-03-25 16:29:30 -07:00
ZeroEpoch1969 d5a3742849
Forgot something 2018-03-24 23:08:50 -07:00
ZeroEpoch1969 88f89d7e67
Tested to be working, but made some minor changes. 2018-03-24 18:41:51 -07:00
Lemon 01223d44ef
that shouldn't have pushed.. 2018-03-24 20:44:09 +05:00
Lemon 3576a9bb6e [UNTESTED] implement player verification system 2018-03-24 20:41:45 +05:00
ZeroEpoch1969 50cb6c4ca9
Improvements 2018-03-18 01:32:50 -07:00
ZeroEpoch1969 c423f273c5
Fixed freezer. Resolves #48 2018-03-12 21:43:51 -07:00
ZeroEpoch1969 5223339a9e
Improve PvP blocker 2018-03-10 13:51:19 -07:00
Seth 664c56dfd5
Update FUtil.java 2018-03-06 13:59:34 -07:00
Seth 101e490104
Commodore was removed 2018-03-05 16:26:20 -07:00
ZeroEpoch1969 7c7265e662
It was just a little mistake 2018-03-02 21:34:43 -07:00
ZeroEpoch1969 40a78f8608
Punishment logging! 2018-03-02 21:29:08 -07:00
ZeroEpoch1969 2185794444
Who needs itemizer? 2018-02-22 23:49:12 -07:00
Lemon 0551337e8b Implement #22 and fix pom.xml.
Signed-off-by: Lemon <minecraftoxlemonxo@gmail.com>
2018-02-22 17:55:04 +05:00
ZeroEpoch1969 2bffcef9a9
Myadmin tags and misc improvements 2018-02-21 18:22:13 -07:00
Lemon c8683ea489
Add Seth to dev
yes yes yes
2018-02-21 22:06:19 +05:00
Pramire 04c6b9ba64 Update Command_entitywipe.java (#35) 2018-02-21 22:04:46 +05:00
Lemon 8b425967a4 Fix #25 and #23 with other misc. fixes.
Signed-off-by: Lemon <minecraftoxlemonxo@gmail.com>
2018-02-09 13:21:44 +05:00
Lemon b801979f72
oops. 2018-01-24 00:02:08 +05:00
Lemon 908caafb7d
oops, fix error 2018-01-24 00:00:51 +05:00
Lemon 4f2a6bfcb8
Add armor & offhand functionality to invsee 2018-01-24 00:00:15 +05:00
Seth 9b6394c8c6 Fixed pom, added tprandom, admins can now kick other admins (#21)
* Fixed pom, added tprandom, admins can now kick other admins

* went too fast

* im mental
2018-01-15 02:53:05 +05:00
Seth 7c3ea836e7 Keep inventory items upon death (#20) 2018-01-08 00:49:38 +05:00
Seth d2eea67f67 Security & improvement update (#19) 2018-01-08 00:33:58 +05:00
untuned 09e5b39099 add /potspy as an alias (#18) 2018-01-05 20:33:33 +05:00
Seth 4ed0db05de Fixed /list-a and optimized /gtfo (#17)
* Fixed /list-a and optimized /gtfo

* heck

* Don't use fuzzy ips for telnet

* It never ends with the list command

* no really it doesnt

* Why not? Commits get squashed and merged here.

* On second thought, it's fine. It only wildcards that last digit.
2018-01-04 22:27:58 +05:00
Seth 3f360a4d5e Bug fixes and improvements (#16)
* Bug fixes and improvements

* Re-add Marco's name

* Actually make the logfile page load.
2018-01-02 10:46:35 +08:00
Seth 059bf14d90 More improvements. (#15)
* This is rediculous

* Forgot some final and this

* Fixed and improved skull caging

* Windows wanted this yeah
2018-01-01 11:43:10 +08:00
Seth d9d1d4fa9b Re-added potion spy (#14)
* Re-added potion spy

* grammar nazi
2017-12-31 11:58:20 +08:00
Seth 7e524da928 Forgot to optimize this. (#12) 2017-12-30 02:44:36 +08:00
Seth 6a09b23331 Added discord support (#11) 2017-12-30 02:12:47 +08:00
Seth 1871451ed6 Lots of formatting fixes and removal of useless things (#10) 2017-12-28 13:50:39 +08:00
Nathan Curran b931cce3bb Fixing marco's mistakes (#8) 2017-12-23 12:07:36 +08:00
Lemon 77131c2138
Update Command_wipewarps.java 2017-11-27 12:16:26 +05:00
Lemon 75c0db71ff
Update Command_stfu.java 2017-11-27 12:14:26 +05:00
Lemon f56ecd4663
Update Command_smite.java 2017-11-27 12:12:56 +05:00
Lemon cffe0a6db5
fix formatting 2017-11-27 12:12:00 +05:00
Lemon a697acbdea
Update Command_gtfo.java 2017-11-27 12:11:02 +05:00
Lemon 381c06e818
Merge branch 'TFM1.12-Alpha' into TFM1.12-Alpha 2017-11-27 12:09:54 +05:00
Lemon 019950152b
Add rainbownick 2017-11-27 12:06:39 +05:00
Lemon 7c42f78426
Add rainbowtag 2017-11-27 12:06:04 +05:00
Lemon 336a2de231
eh 2017-11-27 12:04:53 +05:00
Lemon a1a0894eb5
Log IP's downloading logfiles & uploading schematics 2017-11-27 11:58:40 +05:00
marcocorriero a10a0cbef9
Update Trailer.java 2017-11-22 20:48:45 +01:00
marcocorriero 5ee8c31a3d
Update Command_gtfo.java 2017-11-17 14:15:48 +01:00
marcocorriero ff8f6a1a96
Update Command_disguisetoggle.java 2017-11-17 14:14:25 +01:00
marcocorriero b485a9792d
Update Command_cage.java 2017-11-17 14:13:45 +01:00
marcocorriero cba204d9f3
Applying requested changes 2017-11-17 14:12:21 +01:00
marcocorriero 1fcaef8ab1
Update Command_blockpvp.java 2017-11-16 23:42:05 +01:00
marcocorriero 5d80ef063f
Update Command_blockedit.java 2017-11-16 23:41:03 +01:00
marcocorriero 1c46c26ad9
Update Command_blockcmd.java 2017-11-16 23:39:56 +01:00
marcocorriero 7b33d91c94
Update Command_blockcmd.java 2017-11-16 23:39:44 +01:00
marcocorriero 2443d3eaca Adds Something that is missing
Adds Futil.strictcolorize (that filters Banned colors on smite and gtfo)

Adds Actual Server-TFM features
Adds Wipewarps
adds wipecoreprotectdata
adds spectator
adds rainbownick
adds rainbowtag
2017-11-16 23:32:09 +01:00
marcocorriero 3babdf88a2
Update Trailer.java 2017-11-16 14:54:53 +01:00
marcocorriero 25ad80be60
Makes Trail loggeable to coreprotect. 2017-11-16 14:48:54 +01:00
marcocorriero af11581133
Forgot to cancel the event
im a such stupid xD
2017-11-14 11:34:49 +01:00
marcocorriero 489bbf4fc9
Removes the warning and stuff 2017-11-14 11:23:52 +01:00
marcocorriero c42ad5e706 Adds PVP monitoring
Resolves

God PVPing
Creative PVPing
 Both PVPing.
2017-11-13 18:48:02 +01:00
Lemon 3958c58ed2
He's a developer again. 2017-11-11 22:14:01 +05:00
Lemon 6812d9cfd5
another 2017-11-11 22:12:30 +05:00
Lemon c866571e93
upload 2017-11-11 22:09:57 +05:00
Lemon e1ac92b784
Add files via upload 2017-11-07 14:11:18 +05:00
Lemon 212b367c3c
Update 2017-10-29 19:45:38 +05:00
Lemon a9681fb7d7 Little typo 2017-10-21 22:32:15 +05:00
Lemon 79857345bb Add signpatch service 2017-10-21 22:31:17 +05:00
Lemon 13be60142a Don't need this anymore 2017-10-21 22:28:50 +05:00
Lemon 8f45d08ea3 Fix movement exploit 2017-10-21 22:28:20 +05:00
Lemon 2bb2c77caf Add sign patch 2017-10-21 22:27:43 +05:00
Lemon b9098a7251 Make sure EVERYTHING is uploaded. 2017-10-14 16:21:07 +05:00
Lemon d878fd2458 Patches 2017-10-13 23:38:05 +05:00
Lemon ed2f15cc54 Patches
1. Remove marco from dev
2. Add namehistory
3. Fix grammar issues
4. Actually use CoreProtect bridge to rollback players
5.  Improve automatic wiper
2017-10-13 23:35:11 +05:00
Wild1145 3c09bc7995 Updated default config to account for removal of MC Version field. 2017-09-09 15:16:00 +01:00
Steven Lawson b55ca70056 Logviewer registration overhaul. 2017-08-01 15:59:24 -04:00
StevenLawson 655d7471dc Removed dependency to Craftbukkit and Spigot server code.
This breaks whitelist and onlinemode toggle.
2017-07-25 21:07:22 -04:00
Ryan Wild e16714ea6c Resolved dependency issues - Building correctly 2017-07-25 10:20:36 +01:00
Ryan Wild c4ebbb74c7 Resolved conflicts with TotalFreedom/Devel Branch 2017-07-25 09:53:34 +01:00
Ryan A. Wild SU 8c424a45f9 Updated dependencies removing Libs Disguise due to unstable upstream repos 2017-07-25 09:46:48 +01:00
Ryan 98f0fdb620 Added a catch for if a player is caged and kicked. Resolves #1789 (#2041) 2017-06-30 09:47:31 +02:00
Ryan 26c83ff585 Corrected player message for /disguisetoggle. Resolves #1872 (#2042) 2017-06-30 09:46:31 +02:00
uyscutix f97de65787 Update /smite (#2009)
This update makes smite messages stand out more in chat and to the smitten player.
2017-06-30 09:42:49 +02:00
Ryan 30a6b7a442 Increased text limit. Resolves #1941 (#2039)
* Updated the comment as I forgot that

* Corrected the max limited based on updated issue from 250 to 256
2017-06-30 09:41:01 +02:00
Wade 5d7aa8913b Frontdoor IP update (#2064) 2017-06-30 09:40:27 +02:00
marcocorriero c6a2496d72 Fixed Module_players to include only active admins. Closes #1852 (#2036)
With Madgeek's latest changes, the logviewer now pulls from the 'players' HTTPD module. This edit switch causes inactive admins to no longer have access to the log viewer.
2017-05-29 20:59:06 +02:00
Jerom van der Sar baf73df4f9 Added /adventure, removed /spectator 2017-05-22 20:13:59 +02:00
Jerom van der Sar 5ffbc9e8a4 Update compile version to v1_12_R1 2017-05-22 20:05:41 +02:00
Jerom van der Sar 6e6842dbd2 Update compile version to v1_11_R1 2017-01-08 17:07:28 +01:00
Jerom van der Sar 28142a6883 Update to Spigot 1.11-R1 2017-01-08 17:07:28 +01:00
Wild1145 aaeee0d36e Final fix to the dependency resolution. Reverted minor changes to WorldEdit handling 2017-01-07 23:59:53 +00:00
Wild1145 7b183612e4 Moved all dependencies over to proper resoultion. Currently experiencing an issue with TF-WorldEdit not pulling custom additions 2017-01-07 23:37:25 +00:00
LegendIsAwesomes 0eb0c7a02f Remove /invis smite, add /invis clear. Resolves #959 (#1011) 2016-11-13 16:46:06 +01:00
PacksGamingHD 475b299e37 Fixed a typo in announcements (#911) 2016-11-13 16:30:22 +01:00
ChargedCreeper be8203a832 Added /unloadchunks. Resolves #1779 (#674) 2016-11-13 16:16:42 +01:00
JeromSar 9fa4c0662c Fix /premium. Fixes #1850
Add ArmorStand to list of wipeable entities
Add /whohas clear. Resolves #1836
2016-10-02 23:05:03 +02:00
JeromSar c10b08df27 Force wipe entities when using /entitywipe 2016-10-02 22:42:36 +02:00
JeromSar 25fafa7a6c Fix /wildcard selecting only 1 player. Fixes #1861 2016-10-02 22:33:00 +02:00
Jerom van der Sar 2ff66ad54b Properly block dangerous /wildcard commands 2016-08-27 17:34:42 +02:00
JeromSar 1e47d29adf Add aggelosQQ to the developers list 2016-08-26 22:40:10 +02:00
JeromSar 2008871658 Fixed /dtoggle
Apparantly LibsDisguises does not support plugin reloading.
Now switched back to OxLemonxO's method, using a modified LibsDisguises method
2016-08-26 22:06:20 +02:00
CreeperSeth cadf4e4fc7 Readd /uall and /dtoggle. Resolves #1793 2016-08-26 17:34:13 +02:00
JeromSar 662cef44d5 Automatically despawn item entities after some time. Resolves #901 2016-08-26 12:54:53 +02:00
JeromSar c885bbb144 Prevent /saconfig setrank from setting to a console rank. Fixes #1721 2016-08-26 12:44:57 +02:00
JeromSar f2260d56a4 Fix potential IOOBE in /stfu. Fixes #1750 2016-08-26 12:40:59 +02:00
JeromSar 174a782759 Make /save-all available to admins again. Resolves #1795 2016-08-26 12:36:54 +02:00
JeromSar 6a86f66cf6 Improved entitywiper. Fixes #512 2016-08-26 12:34:18 +02:00
JeromSar b153debdef Block sign interaction. Fixes #1831 2016-08-26 11:57:39 +02:00
JeromSar 71c46b5431 Update the target IP when using /myadmin -o. Fixes #1841 2016-08-26 11:42:13 +02:00
JeromSar 580e88d1a9 Improved wildcard command blocking. Fixes #1842 2016-08-26 11:38:35 +02:00