Commit Graph

4274 Commits

Author SHA1 Message Date
Chiss
debf8ebcba fixed chat not being unsilenced when someone picks word 2014-11-11 18:52:00 +11:00
Shaun Bennett
c0f2f8a88c Remove useless comment/import 2014-11-11 01:47:03 -06:00
Chiss
c37026e4df SSM Dom changes 2014-11-11 18:36:32 +11:00
Shaun Bennett
23ab9756dc Merge remote-tracking branch 'origin/master' 2014-11-11 01:32:55 -06:00
Jonathan Williams
b08cd54666 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-10 23:31:38 -08:00
Jonathan Williams
827fef535f Some commented out testing code in DisguiseManager 2014-11-10 23:30:41 -08:00
Jonathan Williams
108421164c Added support for stats with spaces in them for GiveStat. 2014-11-10 23:30:16 -08:00
Shaun Bennett
cf25d17c66 Update craftbukkit.jar with command event 2014-11-10 23:53:08 -06:00
Shaun Bennett
5b9b7347c6 Add tab complete processing for commands 2014-11-10 23:49:35 -06:00
Chiss
6c6c51e950 fixed compilation problems 2014-11-11 14:28:35 +11:00
Chiss
91f92dc7e1 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-11 12:25:52 +11:00
Chiss
a1eff92bbb fixed achievement kit for sneaky not being accessible 2014-11-11 12:25:36 +11:00
MrTwiggy
e3c50bfb39 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Mineplex.ServerData/src/mineplex/serverdata/ServerCommandManager.java
2014-11-10 18:55:57 -05:00
MrTwiggy
920bdad64c Player report system commit, including functionality for long-form MySQL storage of report logs as well as real-time redis based report sessions. 2014-11-10 18:44:46 -05:00
Chiss
d2301337d2 fixed non-charged block toss not having any velocity. 2014-11-10 19:28:36 +11:00
Chiss
d362fb3b1c fixed punish error 2014-11-10 19:15:56 +11:00
Chiss
0252db5a05 Punish simplification update 2014-11-10 18:40:39 +11:00
Chiss
d6ade5a15b ensured that exp cannot be given multiple times for a game 2014-11-09 14:43:06 +11:00
Chiss
d5515d11b2 fixed kick reason for bans 2014-11-09 14:27:01 +11:00
Chiss
6405253b1c added word wrap on punish text in GUI
only staff+punishee will now see punishments
2014-11-09 14:09:30 +11:00
Chiss
3c39e3d93a changed sev2/3 hack punishements
updated ban kick/login messages
2014-11-09 13:47:25 +11:00
Chiss
a1f7fc5187 warnings are now friendly :)
reach hack detection base
2014-11-09 12:22:55 +11:00
Chiss
b65d2f491e exp gives less for losing 2014-11-09 10:33:50 +11:00
Chiss
2a04ed6eda losing games no longer gives exp 2014-11-09 10:30:26 +11:00
Chiss
ad933400b9 Sheep Quest update
lowered exp on loss
removed Participation exp
2014-11-09 10:06:04 +11:00
Jonathan Williams
403165edf4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-08 14:32:48 -08:00
Jonathan Williams
2781bb3000 Removed stacking buffers. 2014-11-08 14:32:37 -08:00
Jonathan Williams
7fb679e7f5 Changed lobbyBalancer to send one player to each lobby that wasn't full. 2014-11-08 14:32:24 -08:00
Chiss
7e26def6a1 centralised SneakyAssassins module cleanup 2014-11-08 18:40:23 +11:00
Chiss
5ce38c3030 removed final from npcManager 2014-11-08 18:37:18 +11:00
Chiss
b6904f2ae1 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-08 18:36:18 +11:00
Chiss
c0ec9f92fc nulled reference too, just to be safe :D 2014-11-08 18:36:05 +11:00
Chiss
2b0befdc13 fixed listener leak in SneakyAssassins 2014-11-08 18:35:34 +11:00
Jonathan Williams
f03fe663f6 Simplified Lobby balancer code to randomize server selection on best 10 servers.
Increased rate at which bungee retrieves server information.

Increased rate at with servers sends server information.
2014-11-07 22:04:51 -08:00
Jonathan Williams
c310ba734b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 16:09:05 -08:00
Chiss
fc2bba7eeb reverted idlemanager stuff for dmt(had already made talking in chat count as action) 2014-11-08 11:08:13 +11:00
Jonathan Williams
0a874d0ee3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 16:04:14 -08:00
Chiss
8c74022996 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-08 11:04:06 +11:00
Jonathan Williams
48c627db74 UHC tweaks and message changes. 2014-11-07 16:04:06 -08:00
Chiss
601c1912f5 may have fixed sheep teams not working. 2014-11-08 11:03:53 +11:00
CoderTim
80226a20fa Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 18:55:20 -05:00
CoderTim
4c98d833e0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 18:33:46 -05:00
Chiss
e286bec777 added a little msg for people in UHC, informing that it will start soon 2014-11-08 10:30:32 +11:00
CoderTim
5b1a185a5f Fixed Bad Hider achievement 2014-11-07 18:28:28 -05:00
CoderTim
ae35e82e22 Disabled AFK kick in Draw My Thing 2014-11-07 18:28:06 -05:00
CoderTim
96f54c2949 Made DBPool class uninstantiatable 2014-11-07 18:27:20 -05:00
Chiss
75c07588a5 UHC wont start for 2 minutes after creation 2014-11-08 10:22:23 +11:00
Chiss
24725eb22e play a sound when you get punished 2014-11-08 10:15:46 +11:00
Chiss
44fbd9fdd2 updated punishment output.
punishee is now informed of the reason in chat.
2014-11-08 10:11:12 +11:00
Chiss
3a3c2002f5 fixed level exp requirements 2014-11-08 09:17:59 +11:00