Commit Graph

2210 Commits

Author SHA1 Message Date
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
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
a2f7a84120 Fix Hub Rule Book 2014-11-03 18:46:49 -06: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
Chiss
ab62708883 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-03 16:34:20 +11:00
Chiss
20fe69b596 added skills to lore of custom builds
fixed skeleton not having enough arrows
2014-11-02 11:09:20 +11: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
da88d68513 UHC does not record team stats 2014-11-01 15:42:52 +11:00
Jonathan Williams
f1966be6a2 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-31 17:29:57 -07:00
Chiss
7f642673bc fixed deathbomber achievement 2014-11-01 11:25:08 +11:00
Jonathan Williams
1f26aee006 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-31 17:12:27 -07:00
Chiss
0095a03df7 returned bridges to normal 2014-11-01 11:11:35 +11:00
Jonathan Williams
2aced64191 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-31 17:03:15 -07:00
Jonathan Williams
45da22b0bf Fixed bug with parkour enchantment checks. 2014-10-31 17:03:06 -07:00
Chiss
de28906aa5 restored 10 min timer for bridges 2014-11-01 09:18:44 +11:00
Chiss
d0a8a86698 disabled tnt water damage before bridges drop 2014-11-01 09:18:25 +11:00
Chiss
58d6cf199b fixed foodformassesstat kind of? doesnt update db still 2014-11-01 08:59:57 +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
bf6e788f36 1 more fix for sheepy 2014-10-31 16:47:20 +11:00
Chiss
c4264dcea1 fixed sheep skill trigger names 2014-10-31 15:58:11 +11:00
Chiss
50a2bcda66 BACK FROM THE DEAD 2014-10-31 15:40:40 +11:00
Chiss
de08456093 fixed error in block restore 2014-10-31 10:47:18 +11:00