JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,990 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

1960 Commits

Author SHA1 Message Date
Shaun Bennett 8b73b89a17 Merging spectator gui with main branch 2014-11-13 16:03:14 -06:00
Chiss 112f76a29a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-13 18:10:10 +11:00
Chiss 9eaacd20ab fixed slime healing 
fixed sheep quest brute not dropping sheep
updated punish page
 2014-11-13 18:09:54 +11:00
CoderTim 09ca2234c4 Fixed survival games death match bug: https://trello.com/c/jNGSUUGI 2014-11-13 01:49:14 -05:00
CoderTim 7667aa25a8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-13 00:26:53 -05:00
Chiss c5a873ffab Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-13 14:40:26 +11:00
Chiss f9f7a834c2 geno morf 2014-11-13 14:38:33 +11:00
Jonathan Williams 7cad40044a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
	Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java
 2014-11-12 19:36:00 -08:00
Jonathan Williams 1372f74921 Refactored some names in MiniPlugin 
Work on clans.
 2014-11-12 19:21:12 -08:00
Jonathan Williams 0193c397fb Added Kit unlocks to staff server 
Added password persistence in db.
 2014-11-12 19:20:41 -08:00
CoderTim d363637015 Achievement bug fixes 2014-11-12 20:56:57 -05:00
Jonathan Williams 2e848c2ac2 Fixed some of twiggy conflicts. 2014-11-12 05:13:58 -08:00
Jonathan Williams 8d62966abc Created Clans project. 
Converted Fields code complete (not tested).
 2014-11-12 05:13:16 -08:00
Chiss 71a93bead5 Updated punish to be even less confuse. 2014-11-12 09:49:03 +11:00
Chiss d7141e4943 Added warning note to punish 2014-11-11 20:02:35 +11:00
Chiss f7ad986503 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-11 19:05:58 +11:00
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
Chiss c61ad8907a set minimum MP level for staff 2014-11-08 09:15:27 +11:00
Chiss 5da0c53997 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-08 08:56:52 +11:00
Chiss e773d44564 limited max exp so UHC doesnt give you a billion exp. 2014-11-08 08:56:30 +11:00
Jonathan Williams 4ac70281d4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 13:54:22 -08:00
Jonathan Williams 3309c0406b Added ∞ for admin/owners as player level. 
Fixed customer support issue where it wasn't totaling coins correctly.
Fixed Recharge memory leak.
 2014-11-07 13:54:11 -08:00
Chiss bd730b1e5a Fixed OITQ not giving wins. 
Added silence during word selection in DMT
 2014-11-08 08:46:26 +11:00
Chiss c64e4e3b5f fixed winners/losers for death tag. 2014-11-07 23:35:43 +11:00
Chiss 908a8506a7 fixed broken OITQ kit 2014-11-07 23:21:30 +11:00
Chiss 519e63a1c1 re-unlocked kits for single game ultra chaps. 2014-11-07 23:10:33 +11:00
Chiss c93862f299 updated player level 
added /givestat command for owners (must use full string; Global.ExpEarned)
 2014-11-07 22:10:41 +11:00
Jonathan Williams 5c6f12db20 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 02:35:48 -08:00
Jonathan Williams 33696d1e28 Fixed null resourcePack problem. 2014-11-07 02:35:38 -08:00
Chiss 9c80103d6e completely disabled gamehost manager (double safe) 2014-11-07 21:32:44 +11:00
Jonathan Williams 2c098e531a Added error catching for arcade configuration. 2014-11-07 02:14:34 -08:00
Jonathan Williams f0099368d0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 01:27:16 -08:00
Jonathan Williams 264df5af79 Fixed load time issue with ServerConfiguration. 2014-11-07 01:27:07 -08:00
Chiss c245f84593 increased exp per level in mineplex level achievemnet 2014-11-07 20:10:15 +11:00
Chiss fadaa59526 added mineplex level 
removed ability to go into negative gems as villager morph
 2014-11-07 19:20:15 +11:00
Chiss 6ded835ba4 MAC will no longer false positive on people standing blocks from block morph. 2014-11-07 14:14:43 +11:00
Chiss cd4d2c16a8 Fixed fortitude healing too much 2014-11-07 14:07:22 +11:00
Chiss a67842b504 returned hub to normal 
removed flaming pumpkins from arcade
 2014-11-07 12:54:38 +11:00
Chiss b7ce12165e game host stuff 2014-11-07 12:14:33 +11:00
Chiss 4c675cca9c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2014-11-07 11:54:14 +11:00
Chiss 91e0b42de8 Added start of MPS stuff 
Some new gadgets
 2014-11-07 11:52:58 +11:00
Jonathan Williams f931bd26e6 Updated ServerConfiguration to support resourcepack and Arcade settings. 2014-11-06 00:25:49 -08:00
Jonathan Williams 6f2a6a6ebd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-05 14:45:54 -08:00
Jonathan Williams 44ccd452a3 Added ServerConfiguration. 
Added support to enable whitelist, alter max players and pvp value.
 2014-11-05 14:44:56 -08:00
Jonathan Williams 4722062a36 Friend: 
Prevent display of staff servers to non-staff.
Prevent display of CUST servers from everyone.
 2014-11-05 14:44:25 -08:00
Jonathan Williams 4254225462 CoinBombs and GemBombs now queue their amounts to prevent excessive database calls. 
Removed excess account row information retrieval on web api when awarding gems/coins.
Added account specific transactional locks in webapi.
 2014-11-05 14:42:11 -08:00
Jonathan Williams ecad60eee3 Added PlayerTracker to Mineplexer 
Changed how max players is displayed in Mineplexer

Added a cut-off of 900 players for each bungee in BungeeRotator, minimum of two records.
 2014-11-05 14:40:40 -08:00
Jonathan Williams 1a09c14642 Reverted database connection pooling because it caused severe login delays. 2014-11-05 14:39:22 -08:00
Chiss f3b9ad8adf Chatting will reset Idle Timer in games (for DMT) 
Minor kit changes
 2014-11-05 14:46:49 +11:00
Chiss a66c3486d3 fixed bug in foot particle. 2014-11-05 11:35:52 +11:00
Chiss b00fb0952a Updated Sheep Quest to be 1.8 comptible. 
Fixed fissure not working on slabs
Fixed a bug in recharge
Added ability for admins to give other people creative (they lose it when the admin quits)
 2014-11-05 11:26:39 +11:00