6ded835ba4
MAC will no longer false positive on people standing blocks from block morph.
2014-11-07 14:14:43 +11:00
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
91e0b42de8
Added start of MPS stuff
...
Some new gadgets
2014-11-07 11:52:58 +11:00
f931bd26e6
Updated ServerConfiguration to support resourcepack and Arcade settings.
2014-11-06 00:25:49 -08:00
6f2a6a6ebd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-05 14:45:54 -08:00
44ccd452a3
Added ServerConfiguration.
...
Added support to enable whitelist, alter max players and pvp value.
2014-11-05 14:44:56 -08:00
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
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
1a09c14642
Reverted database connection pooling because it caused severe login delays.
2014-11-05 14:39:22 -08:00
a66c3486d3
fixed bug in foot particle.
2014-11-05 11:35:52 +11:00
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
3a6968a60b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-04 19:17:21 +11:00
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
174b1f43c4
GiveItem Fixes
2014-11-03 18:24:56 -06:00
50ea13910a
Change GiveItem command to Dev+
2014-11-03 10:26:08 -06:00
30a1df1473
Fix for null pointer in particle foot.
2014-11-01 02:38:59 -07:00
d64e8c5162
Added max of 10 connections for db pool.
2014-11-01 02:35:36 -07:00
86fb78e34c
minor Unused code cleanup
2014-10-31 23:32:59 -07:00
fa0049d22a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-31 23:01:15 -07:00
f206441999
Fix partial commit.
2014-10-31 23:00:53 -07:00
c85ba72730
Added null check for dragooon.
...
Added two treasure keys for halloween give away.
2014-10-31 23:00:13 -07:00
f3770933b6
Merge branch 'feature/database-pool'
2014-11-01 01:59:07 -04:00
0095a03df7
returned bridges to normal
2014-11-01 11:11:35 +11:00
83d182db2e
Fixed Villager exploit! oops
...
Some balance stuff in champs
2014-11-01 08:38:36 +11:00
b5ef46007f
updated npc info
2014-10-31 18:17:12 +11:00
de08456093
fixed error in block restore
2014-10-31 10:47:18 +11:00
aca18bb2e7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-31 10:36:06 +11:00
aa45f031ac
3 new achievement Kits
...
SSM Balance patch
Champs balance
tons of bug fixes
2014-10-31 10:35:47 +11:00
cc8912b27e
Added NPC info messages to NpcManager
2014-10-30 18:20:21 -04:00
50a457ba51
Database pool tweaks
2014-10-29 19:13:28 -04:00
4fc291ea80
Everything but Mineplexer using database pool
2014-10-29 18:43:21 -04:00
5244f65d8f
All connections to db.mineplex.com/Account use database pool
2014-10-29 17:54:40 -04:00
9819b6c10a
Merge remote-tracking branch 'origin/master'
2014-10-27 20:25:47 -05:00
054c26dfbc
New Coin/Gem Command
2014-10-27 19:59:30 -05:00
01d44cd250
Give Item Command
2014-10-27 19:25:59 -05:00
f0ba562265
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-27 18:11:29 -04:00
9f8b119fb7
Bug fixes
2014-10-27 18:09:23 -04:00
006e20bb13
Prevent more than 5 players from being processed at a time on server connect.
2014-10-27 04:35:05 -07:00
e926fc1f10
Fixed TransferCommand
2014-10-27 04:34:35 -07:00
a1c4b8840f
NpcManager no longer uses database connection pool
2014-10-25 16:51:58 -04:00
849d5f1471
lowered gem rewards for MS a little
2014-10-25 18:37:18 +11:00
bd2e7faf3e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-25 13:40:53 +11:00
4002528c51
Updated GUI text.
...
- recharges/etc now use bottom text
- uses appropriate bottom/top for 1.7 or 1.8
- fixed 1.7 dragon bar so it works as it did pre-1.8
- dragon bar in 1.8 will now send dragon+wither, for more reliability
- renamed utils to be more clear
2014-10-25 13:40:34 +11:00
5cf3e6c3a1
Fix for arcade custom tags
2014-10-24 19:36:22 -05:00
25fc3c0645
Achievement Kits (3 games)
...
Halloween Pumpkins
Youtube command (allows kits)
2014-10-24 19:05:57 +11:00
27dc9f7693
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-23 23:58:24 -07:00
d4900c38b1
Halloween server max.
...
CustomTagFix fix for invis armor stand on your own head.
2014-10-23 23:58:13 -07:00
f52a89d2ca
NpcManager teleports slimes correctly
2014-10-20 18:19:19 -04:00
db3354176c
NpcManager stores test server NPCs under a different server name
2014-10-20 18:08:28 -04:00
8630a1ba4c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-17 23:39:21 -05:00
Chiss
Jonathan Williams
Shaun Bennett
CoderTim
Shaun Bennett