Commit Graph

299 Commits

Author SHA1 Message Date
Taah
c071195aaf fix punishments not being retrieved from sql 2022-04-11 00:53:09 -07:00
Taah
9b0b7537c2 fix build.gradle publishing wrong artifact 2022-04-10 17:22:22 -07:00
1dc0e05715 Closes #26 2022-04-10 18:30:21 -05:00
Taah
dc65187381 add /csay
make /say and /csay not parse minimessage messages
add a strip color function to strip a message of minimessage strings
2022-04-10 15:27:25 -07:00
Taah
b449d732b0 Merge branch 'master' of https://github.com/plexusorg/plex into taah-cmd-blocker
 Conflicts:
	src/main/java/dev/plex/command/blocker/CommandBlockerManager.java
	src/main/java/dev/plex/listener/impl/CommandListener.java
	src/main/resources/commands.yml
2022-04-10 15:03:32 -07:00
Taah
8dfaaf7a8c fix /tag
fix /notes
fix /rank
switch /admin to a datautils check instead of using ashcon api
2022-04-10 15:02:50 -07:00
6b7bfacbfd Update EntityWipeCMD.java 2022-04-10 17:01:02 -05:00
ayunami2000
4bbb73d1ff
Merge branch 'plexusorg:master' into master 2022-04-10 17:57:13 -04:00
ayunami2000
aa9f306586 fix entitywipe not actually wiping entities 2022-04-10 17:56:15 -04:00
08a004d65f
Merge pull request #22 from ayunami2000/master
cleanup & fix
2022-04-10 16:16:23 -05:00
d798904394
Update Plex.java 2022-04-10 13:33:49 -05:00
ayunami2000
f78edc55d4 re remove debug logging
lmao
2022-04-10 14:23:34 -04:00
ayunami2000
8866f44aa2 fix issue where matcher would match partial commands 2022-04-10 14:21:34 -04:00
ayunami2000
0fc2aa68b0 remove separated color 2022-04-10 14:10:15 -04:00
ayunami2000
391677596a i forgor 💀 2022-04-10 13:45:52 -04:00
ayunami2000
5988eba06b cleanup & fix 2022-04-10 13:44:36 -04:00
Taah
81d3cc8dde add additional conditions for telnet users 2022-04-10 02:31:07 -07:00
Taah
06fcf531af instead of checking if a command starts with the message, check if each argument of the command is equal to the message until you can't check anymore 2022-04-10 00:42:53 -07:00
Taah
9f7ac310d9 merge master branch and add ayunami's delimiter code, with of course, credit to him added in the code, and fix a bug 2022-04-10 00:25:14 -07:00
Taah
09bc47f3fb Merge branch 'master' into taah-cmd-blocker
# Conflicts:
#	src/main/java/dev/plex/Plex.java
#	src/main/java/dev/plex/listener/impl/CommandListener.java
#	src/main/java/dev/plex/services/impl/CommandBlockerService.java
#	src/main/resources/commands.yml
2022-04-10 00:04:06 -07:00
c8c8fc9c59 WTF 2022-04-10 01:55:20 -05:00
dcecebdc8d Revert API 2022-04-10 01:47:33 -05:00
9849003ecc API 👀 2022-04-09 23:51:27 -05:00
ayunami2000
c801feed6f fix special cases such as worldedit
all my homies hate worldedit
2022-04-09 17:13:47 -04:00
ayunami2000
a87a9241af optimize command blocker 2022-04-09 15:31:55 -04:00
8fb64b8499 :broh: 2022-04-09 00:27:49 -05:00
10dd546c09 Quick fix 2022-04-09 00:26:34 -05:00
333f38fb64 Don't send empty line for list if there are no players 2022-04-09 00:09:54 -05:00
d55eaf0d3d A few more 2022-04-09 00:08:18 -05:00
e35d70bc3c Change config entries 2022-04-09 00:08:03 -05:00
a58b6fbba8 Merge branch 'cmdblocker' of https://github.com/plexusorg/Plex 2022-04-08 21:23:38 -05:00
0f88f7c8fd Change package name 2022-04-08 21:23:22 -05:00
ayunami2000
cf45863632 fix and improve 👍
fix !
2022-04-08 22:13:51 -04:00
187b177b01 add inline comments 2022-04-08 19:05:20 -05:00
ec7d814467 Merge branch 'master' of https://github.com/plexusorg/Plex into taah-cmd-blocker 2022-04-08 18:56:57 -05:00
79b687c80d add debug 2022-04-08 18:56:45 -05:00
271b8a1df4 idk fix it 2022-04-08 18:19:06 -05:00
b939219fc9 Merge branch 'master' of https://github.com/plexusorg/Plex into cmdblocker 2022-04-08 16:57:11 -05:00
9297eb6703 Try to improve things 2022-04-08 16:57:09 -05:00
11c014b822 Merge branch 'master' of https://github.com/plexusorg/Plex 2022-04-08 16:37:20 -05:00
3039125b48 Improve it more 2022-04-08 16:37:13 -05:00
ayunami2000
15b50ac8ae fix mistake 2022-04-08 14:02:56 -04:00
9378062
d756dcb2f4 final update before looking into...
...reusing preexisting plex code for different parts. dont merge until review has been done.
2022-04-08 12:26:46 -04:00
9378062
9f0b8fb56a fix ranks in commandblocker for inactive admins 2022-04-08 11:04:55 -04:00
9378062
a784ffbc8a fixes and other things like that 2022-04-08 10:29:22 -04:00
9378062
13a458859c me when i dont finish my own code 2022-04-08 10:23:08 -04:00
9378062
5f7a89d7cd mOre FEATURES!! (+fixes) 2022-04-08 10:17:39 -04:00
9378062
1c4f43187d just in case... 2022-04-08 09:49:35 -04:00
9378062
af7ca9acef tele was right...this was wrong...
match mode now acts simply, as one may intially expect
2022-04-08 09:43:23 -04:00
9378062
2a23759d34 remove debug message LMAO 2022-04-08 09:39:56 -04:00