Commit Graph

563 Commits

Author SHA1 Message Date
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
16186bdfbb
Merge pull request #27 from ayunami2000/master
fix entitywipe not actually wiping entities
2022-04-10 17:00:18 -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
7b13ca0248 update to gradle 7.4.2 and host a custom fork of the mincrell plugin for now 2022-04-10 01:32:33 -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
8544775be2
Delete build.properties 2022-04-10 01:56:05 -05:00
c8c8fc9c59 WTF 2022-04-10 01:55:20 -05:00
14095fdebb jkn 2022-04-10 01:54:55 -05:00
dcecebdc8d Revert API 2022-04-10 01:47:33 -05:00
f73c63f1e7 test 2022-04-10 00:46:17 -05:00
067094130f Lets try this again 2022-04-10 00:12:44 -05:00
Taah
d16aa6de4c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Plex-Core/src/main/java/dev/plex/command/impl/SayCMD.java
2022-04-09 22:11:06 -07:00
Taah
6086f761eb add /say
fix /tag
2022-04-09 22:10:35 -07:00
b2f1f7e055 Remove ignored files 2022-04-10 00:01:46 -05:00
3c20213c0d oh boy 2022-04-10 00:01:15 -05:00
3500cae2da Oops lol 2022-04-09 23:58:03 -05:00
c4be024619 Merge branch 'master' of https://github.com/plexusorg/Plex 2022-04-09 23:51:29 -05:00
9849003ecc API 👀 2022-04-09 23:51:27 -05:00
ayunami2000
f274e20f84 sanitize minimessage + strip legacy colors 2022-04-09 23:24:44 -04:00
ayunami2000
f180eec44a "OOPS!!" 2022-04-09 21:54:34 -04:00
ayunami2000
b1ef89dae9 fix bug 2022-04-09 21:53:27 -04:00
ayunami2000
de20747d45 Merge branch 'master' of https://github.com/plexusorg/Plex 2022-04-09 17:14:26 -04:00
ayunami2000
c801feed6f fix special cases such as worldedit
all my homies hate worldedit
2022-04-09 17:13:47 -04:00
5fdc5826b7
Update README.md 2022-04-09 16:08:20 -05: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
5a352b2ca0 Set the jar name just to "Plex" 2022-04-09 00:14:36 -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
e421867f63 Bump to snapshot 2022-04-09 00:05:06 -05:00
c9f14dd29d 0.10 doesn't display properly. Let's just go straight to 1.0 2022-04-08 21:42:08 -05:00
f9a504658c Plex 0.10 2022-04-08 21:29:39 -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