Commit Graph

4763 Commits

Author SHA1 Message Date
Keir
4aa84b9180 Store chat messages from the last 30 minutes. 2015-11-30 02:03:26 +00:00
Keir
0ee042f192 Implement equals and hashCode, move compareTo into MessageSnap class. 2015-11-26 23:59:17 +00:00
Keir
3e06451ac1 Whoops, this should be 30 SECONDS, not MINUTES. 2015-11-26 23:50:45 +00:00
Keir
d47b494628 Add /chatcache (mainly for debugging).
Fix cache not being able to store more than 1 value per sender.
Add comparator to sort all messages chronologically.
2015-11-26 23:29:43 +00:00
Keir
edf93ec43f Initial ChatSnap implementation. 2015-11-26 16:55:27 +00:00
Keir
f0e24468d5 Enable reporting functionality for Arcade and Clans plugins. 2015-11-22 14:23:17 +00:00
Keir
dcca67e571 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-22 13:54:16 +00:00
libraryaddict
cfeafff2f6 EntityDismountEvent stuff 2015-11-22 14:44:32 +13:00
Cheese
91e40d0e61 hide testing server MOTD 2015-11-21 13:37:19 +11:00
Cheese
9ef99cee20 fixed merge issues 2015-11-21 11:21:54 +11:00
Cheese
6eb1bef1c6 Merge branch 'master' into minestrike-update
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
2015-11-21 11:09:28 +11:00
Cheese
87a30513de Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-21 11:08:23 +11:00
Cheese
4a0cc79abf fixed silence not working in non-champs servers 2015-11-21 11:08:09 +11:00
AlexTheCoder
8b480cc32b Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-20 18:40:42 -05:00
AlexTheCoder
1274dc860d - Stuff for chiss 2015-11-20 18:40:20 -05:00
Cheese
2f91ca5a8a fixed errors 2015-11-21 10:35:17 +11:00
Cheese
4a70e4da90 more fixies 2015-11-21 10:34:08 +11:00
Cheese
4d128d9c7a fixed some skills and wierd hitbox error 2015-11-21 10:29:48 +11:00
Keir
5bbf5bcce5 Only log to the database when the report has been closed. 2015-11-20 23:05:42 +00:00
Cheese
c7297a7a38 fixed invalid proxies exploding 2015-11-21 09:45:01 +11:00
Cheese
d5076b1c47 CTF fix 2015-11-21 09:41:02 +11:00
Cheese
e0885feea6 Merge branch 'master' into alex-ctf 2015-11-21 09:40:07 +11:00
Cheese
04be896ff6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-21 09:39:50 +11:00
Keir
07b6c7cde7 Display message informing a report handler on how to close a report, when clicked this message will also fill out as much of the command as it can on the clients side. 2015-11-20 22:38:00 +00:00
Cheese
0bc64fec16 Proxy limit fixes 2015-11-21 09:28:15 +11:00
Keir
435f2b643d Fix fetching player report stats. 2015-11-20 22:20:56 +00:00
Keir
ad16c59ab7 Forgot to commit this crucial part... 2015-11-20 22:05:10 +00:00
Keir
470ff67f86 Replace ReportProfile by using statistics to track total reports and accepted, denied & abusive reports. 1 or more abusive reports results in being banned from the report system. 2015-11-20 22:03:57 +00:00
Keir
fc6e1fe003 Notify the handler of a report (if any) when the report they are handling is purged. 2015-11-20 21:10:03 +00:00
AlexTheCoder
386032a4f5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-20 06:03:30 -05:00
AlexTheCoder
f51358552a -B 2015-11-20 05:57:29 -05:00
Jonathan Williams
700e4c9a1f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-19 22:12:08 -06:00
Jonathan Williams
411d6fdb22 Made PlayerTracker use existing code for determining region. 2015-11-19 22:11:45 -06:00
Keir
80c87fa1fc Make reports timeout after 15 minutes of inactivity. 2015-11-20 00:51:21 +00:00
Keir
bceb69bc12 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
2015-11-19 23:52:02 +00:00
Cheese
e14f5a36bd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-20 08:34:19 +11:00
Cheese
f33eedf36d text fix 2015-11-20 08:33:51 +11:00
Sarah
d7d11e57e5 Merge pull request #76 in MIN/mineplex from william-global to master
* commit '4620a5a1626aaefb992ff62a14dc35ed9ae60a86':
  Hub fix
  testing excludes
2015-11-18 15:49:18 -06:00
William Burns
4620a5a162 Hub fix 2015-11-18 21:47:52 +00:00
Keir
cb5672b94c Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-18 20:34:24 +00:00
William Burns
6fa2a58f5d Merge branches 'master' and 'william-global' of ssh://184.154.0.242:25565/min/mineplex into william-global 2015-11-18 18:50:09 +00:00
William Burns
0e1c72e25d testing excludes 2015-11-18 18:46:51 +00:00
Shaun Bennett
1eff698a34 Merge pull request #75 in MIN/mineplex from william-global to master
* commit 'a11ca138e764417c23a0060dd134ef7c49741295':
  ranks
  woops easy fix
  rawr and fixes
  Added the ability to give out game loot.
  Reformatting titles
  Added GlobalGiveCoins. Changes Gems a little and the manager.
  More global stuff! Added GlobalGiveGems.
  Global Packet work. Added giveitem sub-command.
2015-11-18 10:15:33 -06:00
William Burns
a11ca138e7 ranks 2015-11-18 16:01:53 +00:00
William Burns
04a4b072af woops easy fix 2015-11-18 15:48:25 +00:00
William Burns
2e223d0660 rawr and fixes 2015-11-18 15:42:33 +00:00
William Burns
e16ee9036a Added the ability to give out game loot. 2015-11-18 14:35:40 +00:00
William Burns
e83b49d490 Reformatting titles 2015-11-18 13:43:22 +00:00
William Burns
e19d4e11e1 Added GlobalGiveCoins. Changes Gems a little and the manager. 2015-11-17 18:54:39 +00:00
William Burns
a28adc9673 More global stuff! Added GlobalGiveGems. 2015-11-17 18:26:19 +00:00