Commit Graph

751 Commits

Author SHA1 Message Date
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
CoderTim 4c98d833e0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-07 18:33:46 -05:00
CoderTim 96f54c2949 Made DBPool class uninstantiatable 2014-11-07 18:27:20 -05: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
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 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 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 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 1a09c14642 Reverted database connection pooling because it caused severe login delays. 2014-11-05 14:39:22 -08: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
Chiss 3a6968a60b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-04 19:17:21 +11:00
Chiss f6df7705b1 - Added 3 kits for DMT
- Added achievement kit for OITQ/Sneaky Assassins/DMT
- Fixed stats/achievements not working (Keen Eye, I See You, Incompetence, DMT Wins)
- Various improvements/fixes for Champions
- Nerfed trollability of Digger kit in DE
2014-11-04 19:17:06 +11:00
Shaun Bennett 174b1f43c4 GiveItem Fixes 2014-11-03 18:24:56 -06:00
Shaun Bennett 50ea13910a Change GiveItem command to Dev+ 2014-11-03 10:26:08 -06:00
Jonathan Williams 30a1df1473 Fix for null pointer in particle foot. 2014-11-01 02:38:59 -07:00
Jonathan Williams d64e8c5162 Added max of 10 connections for db pool. 2014-11-01 02:35:36 -07:00
Jonathan Williams 86fb78e34c minor Unused code cleanup 2014-10-31 23:32:59 -07:00
Jonathan Williams fa0049d22a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-31 23:01:15 -07:00
Jonathan Williams f206441999 Fix partial commit. 2014-10-31 23:00:53 -07:00
Jonathan Williams c85ba72730 Added null check for dragooon.
Added two treasure keys for halloween give away.
2014-10-31 23:00:13 -07:00
CoderTim f3770933b6 Merge branch 'feature/database-pool' 2014-11-01 01:59:07 -04:00
Chiss 0095a03df7 returned bridges to normal 2014-11-01 11:11:35 +11:00
Chiss 83d182db2e Fixed Villager exploit! oops
Some balance stuff in champs
2014-11-01 08:38:36 +11:00
Chiss b5ef46007f updated npc info 2014-10-31 18:17:12 +11:00
Chiss de08456093 fixed error in block restore 2014-10-31 10:47:18 +11:00
Chiss aca18bb2e7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-31 10:36:06 +11:00
Chiss aa45f031ac 3 new achievement Kits
SSM Balance patch
Champs balance
tons of bug fixes
2014-10-31 10:35:47 +11:00
CoderTim cc8912b27e Added NPC info messages to NpcManager 2014-10-30 18:20:21 -04:00
CoderTim 50a457ba51 Database pool tweaks 2014-10-29 19:13:28 -04:00
CoderTim 4fc291ea80 Everything but Mineplexer using database pool 2014-10-29 18:43:21 -04:00
CoderTim 5244f65d8f All connections to db.mineplex.com/Account use database pool 2014-10-29 17:54:40 -04:00
Shaun Bennett 9819b6c10a Merge remote-tracking branch 'origin/master' 2014-10-27 20:25:47 -05:00
Shaun Bennett 054c26dfbc New Coin/Gem Command 2014-10-27 19:59:30 -05:00
Shaun Bennett 01d44cd250 Give Item Command 2014-10-27 19:25:59 -05:00
CoderTim f0ba562265 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-27 18:11:29 -04:00
CoderTim 9f8b119fb7 Bug fixes 2014-10-27 18:09:23 -04:00