fcb3d20778
Move tablist stuff to portal, show current server on tablist
2015-02-05 23:20:39 -05:00
14fc6f2145
Chest Update
2015-02-06 14:16:10 +11:00
44bab01e33
Added NoCheatPlus hook for double jump fly hack prevention.
2015-02-04 21:52:14 -08:00
dbd6f449eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
2015-02-05 11:37:35 +11:00
c7d4b14f4c
Revert "Revert "Work on treasure............""
...
This reverts commit 49bfe385bf
2015-02-05 11:34:29 +11:00
e91d76960c
Add a toggleable friends GUI - Chat to Inventory and back
2015-02-03 22:03:07 +13:00
ea24bc1d87
Prevent treasure chests being opened from interfering with portals, ladders, etc.
2015-02-01 12:19:33 +13:00
eccc2f2fb0
Fixed bug with dropping gadget items interfering with games and being set in the wrong slot with the wrong name
2015-02-01 08:04:19 +13:00
ff56578d15
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-29 22:29:12 -08:00
49bfe385bf
Revert "Work on treasure............"
...
This reverts commit 50a8fb03a9
2015-01-29 22:28:41 -08:00
ff73c88182
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 19:28:29 +13:00
a1529e0884
Notify player when no friends found when searching
2015-01-30 19:28:04 +13:00
352a29390b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-29 22:19:12 -08:00
ed08e4b112
Changed coloring for server line in friends gui.
2015-01-29 22:18:59 -08:00
96ce95b72e
treasure changes
2015-01-30 00:37:02 -05:00
79a60db15d
More tweaks
2015-01-29 22:41:54 -05:00
1cc0879ce9
treasure stuff
2015-01-29 22:17:46 -05:00
81a52184c9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-29 17:50:24 -08:00
b14d09ed2c
Reduced connection checking to every 2 minutes.
...
Removed kill script call as it was encountering access errors..
2015-01-29 17:47:59 -08:00
505dcc1e8e
Add friends gui, deprecate the old chatbased friends display
2015-01-30 13:46:07 +13:00
e18107a82f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 11:08:37 +11:00
6a269cc03b
More SSM Changes
2015-01-30 11:08:23 +11:00
50a8fb03a9
Work on treasure............
2015-01-29 18:37:29 -05:00
7f4bcd1210
Smash Update
...
new scoreboard (not implemented yet)
reward changes
2015-01-29 11:54:59 +11:00
f80e640d34
Map Parser voxel update
...
Disabled spec GUI in bridges
other minor changes
2015-01-26 11:23:08 +11:00
10ab390bd7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-26 11:20:12 +11:00
40ef3317dd
committing necessary files to merge
2015-01-26 11:20:02 +11:00
58a8a32e93
Added cross-server Announcements and Global messages.
2015-01-24 01:44:22 -08:00
39d1a48bc1
Added cross-server instant punishments.
...
[Punish] Banning doesn't kick.
2015-01-23 23:33:24 -08:00
34cd48cfb6
Fix for duplicate check.
2015-01-23 01:17:27 -08:00
92ef0af39d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
2015-01-23 22:01:51 +13:00
b92226a771
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-23 00:55:36 -08:00
73866669b8
Added RestartCommand and SuicideCommand
...
ServerMonitor will now cleanup bloated Lobbies starting from the highest number lobby.
Fixed issue with new servers getting cleaned up as excess as soon as they started.
2015-01-22 23:19:40 -08:00
08078c1622
Removed Logger
2015-01-22 23:18:38 -08:00
a1f2a3a2a1
Clan Energy
2015-01-22 20:34:44 -05:00
d90a46252e
Allow commands to pass when muted.
2015-01-19 00:50:05 -08:00
9b4f1a491e
Add new method to Hologram - Remove hologram on entity death
2015-01-18 21:23:47 +13:00
c83643564b
Fixed scoreboards reading from file.
...
Fixed scoreboard server name length
Changed how we pull server group on startup.
2015-01-13 12:22:47 -08:00
d9360f2599
Ok testing fail. Reverted ServerConfiguration change.
2015-01-12 12:48:57 -08:00
cd5574ab43
Changed ServerConfiguration to only pull its groupName specifically.
...
Changed StatsManager to only run once every second and to upload all stats.
2015-01-12 12:19:13 -08:00
e14dfcf313
Fixed Lobby sending with Portal.
2015-01-12 09:55:32 -08:00
ac709d09ce
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-11 00:42:55 -08:00
8e04a2a5f2
Portal now checks server status and player's rank before sending them to a server to prevent login spam.
...
Refactored portal method names.
2015-01-11 00:42:31 -08:00
47fc6e3b94
Revert "Added pool based repository and converted everything but account and donation repositories to it."
...
This reverts commit 8de8d31eec
2015-01-11 00:41:40 -08:00
8de8d31eec
Added pool based repository and converted everything but account and donation repositories to it.
2015-01-10 11:53:25 -08:00
8ce097d837
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-04 13:21:35 +11:00
86993ddd55
Fixes again for number player names.
2015-01-03 04:27:28 -06:00
cc06b0ad33
Refactored statmanager to only upload stats on disconnect and only one player per tick.
...
Fixed derp json crap with redis treating a name with only numbers as a number and adding .0 on it.
2015-01-03 01:58:04 -06:00
aca7fd6849
Removed all create calls
2014-12-31 09:38:41 -05:00
4b937dfade
Refactored inventory repository to use 1 second queue
...
Added 15 second timeout for server connection if db freezes.
2014-12-31 09:38:28 -05:00
5f36c8e424
minor scoreboard changes
...
legend loot bonus
2014-12-30 08:50:37 +11:00
f0e3520343
Prevent inferior ranks to override actual ranks unless its Rank.ALL via Enjin
2014-12-29 08:02:14 -05:00
01bc2ed2ba
Uno mas warning cleanup.
2014-12-29 07:11:21 -05:00
8b5d6ecb6c
Cleanup of warnings.
2014-12-29 07:10:41 -05:00
419f33fcc3
Refactored AntiHack a bit to try and remove CCM
2014-12-29 07:07:05 -05:00
97f57b655b
Prevent horses from spawning in Clans
...
Added Building supplies shop and pvp shop to clans.
2014-12-29 06:44:00 -05:00
a7f77c09fe
Work towards another memory fix.
2014-12-29 06:42:43 -05:00
5a57c5f372
Added Gold saving/retrieval from mysql.
...
Converted DonationManager to MiniDbClientPlugin.
Fixed bug in DonationRepository with gold.
2014-12-29 06:42:20 -05:00
d83a63ef57
Changed FriendManager to start supporting expiry friend requests.
2014-12-26 07:36:07 -05:00
8702bafbd0
Changed storage to player names instead of Player object for CustomTagFix
2014-12-26 00:29:57 -05:00
81e423fa4f
Fixed Server transfer stuff. Portal send works!
2014-12-24 14:35:34 -05:00
eb5a7b4276
Added Legend package for support.
...
Refactored Key/Chest commands and added FrostLord package.
Removed password, added whitelist.
2014-12-24 03:41:17 -05:00
adc5769890
Fix wither not accessible for ranks, fix wither having weird naming in inventories
2014-12-24 04:07:28 +13:00
5dcda626e7
Fixed port stuff for MPS
2014-12-23 08:08:41 -05:00
07cca7a1d4
Fixed NPE in GameHostManager
...
Fixed CD for creating server.
2014-12-23 06:46:05 -05:00
4bfd34034b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-23 22:19:50 +11:00
8c2d879036
added ownership of legend particle for legends.
2014-12-23 22:17:39 +11:00
d2e078f890
Fixed ranks for MPS
2014-12-23 06:04:42 -05:00
fb841c3831
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java
2014-12-23 05:57:45 -05:00
bb8b1d60f9
30 seconds recharge on ability to host locally.
2014-12-23 05:56:17 -05:00
5f509ca488
Rank fixes, visual fixes, lets hope things work!
2014-12-23 04:55:00 -06:00
7ef2edd498
Removed extra enjin message.
...
Added retrieval of servergroups to identify if server is a player server or not.
2014-12-23 04:19:24 -05:00
9a767af018
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 03:44:05 -05:00
f00854ee4c
Removed bad code thats bad from the bad birdy.
...
Hooked in PersonalServer item click and command.
Re-enabled redis transport commands.
Added transfer command sending on personal server start.
Updated Enjin to handle more versatile inventory purchases.
2014-12-23 03:43:56 -05:00
6b5b072ae8
missing file
2014-12-23 19:36:23 +11:00
7496f64d58
benefit
2014-12-23 19:36:10 +11:00
103ff0e6b0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 02:57:24 -05:00
2a585936b7
Maybe I should test before I commit!
2014-12-23 00:37:29 -06:00
2848ec2751
Use the correct data value this time!
2014-12-23 00:33:47 -06:00
48fdfbb8f0
Hub changes for private servers
2014-12-23 00:30:15 -06:00
4cac65a81f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 00:50:20 -05:00
0e85b7e6cc
Added HostName to server groups.
...
Added handling of private server groups in server monitor.
Optimized server group/server status load.
Added ability to add/remove server group.
2014-12-23 00:49:52 -05:00
0659f497c0
frost lord update
2014-12-23 15:00:32 +11:00
4797b251b1
YAY Champions enable/disable works.
2014-12-23 11:39:03 +11:00
825b25e8d1
fixed my bug in miniplugin
2014-12-23 11:29:48 +11:00
ec9401506c
Game servers can now run champions/normal on the fly.
2014-12-23 11:18:48 +11:00
a197724de8
fixed le bugs.
2014-12-23 10:48:15 +11:00
224d1bbf63
blizzard particle redo
...
hub text
2014-12-23 10:36:48 +11:00
b83a81ec7e
Fixed little conflict issue.
2014-12-22 09:25:02 -05:00
9b3350c8c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-22 09:22:50 -05:00
d920439ec5
Clans update. Laying groundwork for energy
2014-12-22 09:22:10 -05:00
4a50e3ae62
Merge branch 'chissbrokethis'
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
2014-12-22 10:57:39 +11:00
98b614848d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into HEAD
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
2014-12-22 10:54:31 +11:00
1a56f074b3
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-22 10:22:13 +11:00
eba54c6b8a
Removed hub snake parkour
2014-12-22 10:21:58 +11:00
52cc0862d7
Memory leak fix for CUSTOM TAG
2014-12-18 18:29:33 -05:00
4c4ba34d39
Merge pull request #5 from feature/chatslow to master
...
* commit '9ef0ea629c57b148d815b93a455f9817ce512960':
Added changes from master to Chat
Chat Slow Command
2014-12-17 20:08:32 -06:00
9ef0ea629c
Added changes from master to Chat
2014-12-17 20:07:39 -06:00
899add5fcd
Merging changes from master
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
2014-12-17 20:07:11 -06:00
60f567a3fb
fixed some errors ;o
2014-12-18 12:47:00 +11:00
679f7909b0
Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers
2014-12-18 12:45:56 +11:00
56d14b7bc0
Particle stuff
2014-12-18 12:45:45 +11:00
2677d2e557
Fancy icons for 1.8!
2014-12-17 19:15:31 -06:00
d19431a47f
Rename Clicked to onClick
2014-12-17 18:40:44 -06:00
6e42894d5c
Refactor button again
2014-12-17 18:33:24 -06:00
12973aba7d
Merge branch 'master' into feature/private-servers
2014-12-17 16:47:19 +11:00
e1db8d6a5d
Why was I missing a entitytype import..
2014-12-17 18:37:58 +13:00
26d92f0381
Add missing class
2014-12-17 18:33:43 +13:00
0e7adab3eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-17 18:32:50 +13:00
17ac36d9ae
Add wither pet, pets are no longer stackable. Enderdragon no longer has his health changed in the hub
2014-12-17 18:31:51 +13:00
83218c9a73
Pushing unfinished code for laptop
2014-12-16 11:42:06 -06:00
a433ad764d
Wither Morph
...
Legend Particle
2014-12-16 16:18:09 +11:00
c43ee95c55
Added 1.8 hooks for disguise setName and getName
...
Refactored method names in some disguise classes.
2014-12-15 21:46:14 -05:00
1907014db4
disguise wither update
2014-12-16 13:28:59 +11:00
2e7d101850
added material/data for gametypes
2014-12-16 12:26:37 +11:00
75cf80652c
Remove customnametrue from horse mount
2014-12-16 01:36:42 +13:00
d7eb01e8f0
fixed CC Bug :D
2014-12-15 15:49:52 +11:00
e02bcd8b84
Revert the revert of the revert.
2014-12-14 22:58:49 -05:00
d1be64d7e7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
2014-12-15 14:56:09 +11:00
95081a8ab7
Gems cannot be given multiple times for certain things (prevents bugs giving mass gems)
2014-12-15 14:33:38 +11:00
4482e46250
Changed int to atomic for concurrency
2014-12-14 21:53:55 -05:00
eefa4de838
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-14 20:50:35 -05:00
2a58b822a0
Safeguard on connecting vlaues.
2014-12-14 20:50:19 -05:00
d0f8a6a063
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-15 12:26:25 +11:00
9136165d4f
fixed christmas elf name
...
pet names now have limited range
2014-12-15 12:24:40 +11:00
9fb2231d76
Added connecting clients as a factor for status snapshot.
...
Added online check for DonationManager rewarding local info.
2014-12-14 02:32:52 -05:00
5b67e2182a
Added disguise to Pet Manager for eventual wither disguised pet.
2014-12-14 02:30:39 -05:00
78a34b1517
hopefully fixed a bug where pumpking king despawned.
...
removed 11 disc from loot
2014-12-13 11:55:12 +11:00
9a16616e6c
Add fix for wither bossbar and add a checkpoint hologram for snake bit in xmas
2014-12-12 12:40:23 +13:00
6b1fa91565
Xmas Updates
2014-12-11 12:42:06 +11:00
86b9d8342f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Sleigh.java
2014-12-11 11:27:47 +11:00
358d5fde44
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-10 22:38:19 +11:00
450d3eb923
merge
2014-12-10 22:38:08 +11:00
c4fee8e681
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Hub/.classpath
2014-12-10 03:34:53 -08:00
ea034812b9
Fixed path finder crap in UtilEnt
...
Cleaned up unused code in OutfitRaveSuit
Fixed eclipse bug for NotificationManager
Removed christmas/Sleigh columns.
2014-12-10 03:32:35 -08:00
db8e0484ab
missing files + new pet
2014-12-10 18:23:22 +11:00
0aba82eee6
fixed some eclipse java6 stuff with mail
...
Christmas game update
2014-12-10 15:38:57 +11:00
bee81ff455
lowered coin rewards
2014-12-09 20:23:56 +11:00
828fabb80a
Initial Christmas Chaos update
2014-12-09 20:04:59 +11:00
ef8e5104f1
SnD Kits
...
minor bug fixes
2014-12-08 17:28:18 +11:00
64c8edc292
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-08 17:25:03 +11:00
0759a373da
Fix treasure chest hologram
2014-12-07 01:25:36 -06:00
7402eb2f91
Merge remote-tracking branch 'origin/master'
2014-12-06 01:00:40 -06:00
1276e0c0d5
Chat Slow Command
2014-12-05 21:33:31 -06:00
21e80af6cb
Fixed Cosmetic menu buttons
...
Removed map in wrong location
Removed message for removing armor.
2014-12-05 01:15:25 -08:00
828e8d4115
Fixed bug with ok buttons still active after clicking ok in confirmation page.
2014-12-04 23:48:22 -08:00
3d3f9012ff
Added some base Clans shops.
...
Added support for Gold
Refactored failed db call code a bit.
2014-12-04 23:41:49 -08:00
80971c2fe7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-05 16:27:30 +11:00
4430efd7be
minor updates
2014-12-05 16:25:34 +11:00
f48085d5ca
Merge remote-tracking branch 'origin/master'
2014-12-04 17:41:40 -06:00
0bb2d1db5b
Some changes *_*
2014-12-04 17:29:47 -06:00
59f93d46ec
Refactored IButton
...
Added ComplexButton
Added Clans farming.
Added Clans Recipes.
Added Clans gameplay.
Added shop files structure.
2014-12-04 05:05:27 -08:00
1fd1e5cc34
Removed unused gem booster code.
2014-12-02 12:50:53 -08:00
384f296d60
checkPlayerName returns actual name (casing correct)
...
Refactored chests/keys in support server.
Fixed bug with enjin chest/key giver.
2014-12-01 16:14:02 -08:00
0540168af7
Fixed CCM in AntiHack
2014-12-01 03:01:26 -08:00
e7cf4eb51d
Removed use of Gem Boosters
...
Cleaned up some unused imports.
2014-12-01 02:27:39 -08:00
172f4d20b7
Removed gem transaction logging.
2014-12-01 02:22:51 -08:00
5038edc46b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-01 00:07:33 -08:00
171eec5a37
Removed reward logging.
2014-12-01 00:05:57 -08:00
89892097d0
No one cares about ComplexItemLayout
2014-11-30 16:48:57 +13:00
9d32048b9e
Fixed merge conflict problem.
...
Added spawn repository.
2014-11-29 03:17:33 -08:00
f507db7664
Reworked spawn to save to database.
...
Work on Clans:
Fixed clan loading/updating/adding.
Refactored some code for Clans.
2014-11-29 03:16:37 -08:00
4b2998793c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-28 14:16:07 -08:00
b3beadf8b5
made recharge look nicer for 1.7
...
added missing files
2014-11-29 09:14:33 +11:00
54aefbf40d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-28 14:10:28 -08:00
ca34ac4e02
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-29 09:09:23 +11:00
92ea94c3be
Fixed creating clan delay in clans/ClientClan.java
...
Added logging for Mineplexer startup.
Fixed return generated keys in RepoBase
2014-11-28 14:06:41 -08:00
e56970a212
Let ShopItem no longer extend CraftItemStack and instead extend ItemStack to remain useful to other plugins and use ItemMeta
2014-11-29 07:21:37 +13:00
62a172e01b
Removed all the UUIDFetcher calls.
2014-11-27 22:34:05 -08:00
8f9f88987b
mods can no longer use /tp Here
...
only disqualifies on tp in live games.
2014-11-28 10:09:18 +11:00
fdc67e021c
Staff using /tp commands will take them out of the game (Mod to Admin only)
...
Changed spec /tp command to /spec
2014-11-28 10:00:31 +11:00
d5d9e2eb14
Don't bother with these checks in ItemLayout
2014-11-28 09:30:57 +13:00
8d12b8e565
Check item has Lore before trying to use it
2014-11-28 09:30:27 +13:00
d1b6aee802
Change ItemLayout to allow repeats of item arrays
2014-11-27 14:34:34 +13:00
bd8ca593e8
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SearchAndDestroy
2014-11-27 08:06:13 +13:00
ac0c024b1b
Use nmsPlayer.m() instead. This sets both the container to default and tells the open inventory to close. Which fixes any normal blocks like DoubleChest from remaining visually open to others.
2014-11-27 07:16:59 +13:00
86fe7344c7
When another inventory is opened with a previous inventory already open, this fixes the cursor position from being reset to the center of the screen. For those interested. Its basically denying the inventory close packet from being sent.
2014-11-27 06:56:19 +13:00
34e320dfee
Create untested ItemLayouts for your customized layouts of your items.
...
If you look to your right (ComplexItemLayout) you can define layouts such as "XX(de)XX(fg)XX" then call to replace all occurances of the letter d with this item. The (de) will then be set to that item.
2014-11-27 06:03:28 +13:00
b160822260
Add follow entity to holograms
2014-11-27 03:17:59 +13:00
f5533dbce2
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SearchAndDestroy
2014-11-27 01:13:14 +13:00
c76ad50136
Allow removal of packet handler
2014-11-27 01:08:42 +13:00
84b56708f9
Added new class ItemBuilder for chain building ItemStacks
2014-11-27 01:08:38 +13:00
9928811a71
Merge pull request #2 from Better-Holograms to master
...
* commit 'ef59cb7a9db25b8688ee6e3254661d9cc65a5e89':
Remove the 'Made by Shaun'
Fix up mistakes in the previous modifications
You have your HologramManager presented in a light most fair. Should be worth noting I didn't test it thoroughly
Ignore wither skulls for CustomTagFix
Remove old holograms and add new holograms
2014-11-26 06:07:57 -06:00
ef59cb7a9d
Merging changes from master to Better-Holograms
...
* master:
Antistack replacement
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2014-11-27 01:01:19 +13:00
30e2de6f22
Remove the 'Made by Shaun'
2014-11-27 00:50:02 +13:00
00e372820b
Fixed UI update when purchasing items.
2014-11-26 02:13:19 -08:00
2afe84d7c7
Fixed stupid query thing....defek7.
...
Removed extra logging.
2014-11-26 00:59:10 -08:00
3ad3fb21ff
Fix up mistakes in the previous modifications
2014-11-26 21:35:45 +13:00
f39e3dcec7
Fixed traversing resultSets.
2014-11-26 00:08:51 -08:00
06526d1e96
Fixed sql bug in FriendRepository
...
move/cleanup in RepoBase
2014-11-25 21:45:34 -08:00
15d129d184
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitData.java
2014-11-25 21:18:12 -08:00
909877c869
Wiggle left, wiggle right, hope this works.
2014-11-25 21:17:30 -08:00
4ccb242066
i added a space!
2014-11-26 16:02:11 +11:00
03075fecae
You have your HologramManager presented in a light most fair.
...
Should be worth noting I didn't test it thoroughly
2014-11-26 10:28:37 +13:00
484dfaaea9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-25 13:25:41 -08:00
3b54789767
Optimized logins dealing with mysql with multiqueries.
...
Added lazy loading of Pool data and Loaded check before performing anything.
Refactored MiniClientPlugin and created MiniDbClientPlugin
Renamed RankBenefitManager9000 to BenefitManager
Removed /send ability for now.
2014-11-25 13:25:13 -08:00
3c76fde190
Ignore wither skulls for CustomTagFix
2014-11-26 09:51:08 +13:00
141c08ceb8
Remove old holograms and add new holograms
2014-11-26 09:18:36 +13:00
f1fbc21570
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-11-23 20:02:09 -06:00
c7f2a8072e
Antistack replacement
2014-11-23 19:51:23 -06:00
2871446f74
reduced max amount of blocks from explosions
2014-11-23 15:01:04 +11:00
37b5e495b8
Update local cache of inventory and if fail, revert change.
...
Removed full lock on login.
Removed Thanskgiving benefit.
2014-11-22 17:52:22 -08:00
d1578b12d4
Removed extra console logging.
2014-11-21 14:45:55 -08:00
7bd12ab850
Re-did benefits and inventory to only update locally if db succeeeds......DOH
2014-11-21 14:41:25 -08:00
29204de987
Removed old benefits.
...
Added youtube rank application from Owner
Fixed Dom bug : https://trello.com/c/OtwrpFXg/90-champions-24-skill-tokens-2-item-tokens-in-champions-so-broken
2014-11-20 21:58:39 -08:00
2446e6d64d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-20 21:42:40 -08:00
1f5be77880
Fixed text in Dom shop.
...
Cleaned up some code in benefit stuff.
2014-11-20 21:42:33 -08:00
f1ba5947a4
Some more wither updates
2014-11-21 16:32:12 +11:00
6c63552480
Refactored RankBenefitsGiver9000
...
Added Thanksgiving benefits (1 treasure key).
ServerMonitor now ignores Testing group.
2014-11-20 21:24:23 -08:00
7a8759dfba
updated disguisemanager so it uses player arg
...
fixed invisibility bug on disguises for specific players
updated champs skills
made some hard achievements a bit easier
2014-11-21 09:42:05 +11:00
ab78b4b89d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-19 22:25:17 -08:00
828b866fc1
Added functionality to RepositoryBase to return generated keys.
...
Prevent invalid UUID from jacking up web call in Enjin listener.
2014-11-19 22:23:42 -08:00
450cc9ada2
Champions achievement update
...
Wither update
2014-11-20 17:21:22 +11:00
e99a3f6544
Merge remote-tracking branch 'origin/master'
2014-11-17 18:19:06 -06:00
f071d2e727
Fix for TNT explosion in Bridges
2014-11-17 18:09:58 -06:00
13ba32f2f4
Added command queueing for failed commands in EnjinTranslator.
...
Added verification of coin/gem application in Web api.
Added code to support polling last 100 purchases with EnjinTranslator
Added UUId lookup to CoreClientManager and fixed Async to Async calls with DatabaseRunnable.
2014-11-17 14:06:38 -08:00
857ff29461
Removed buggy player disguises.
...
Removed datavalues from wither disguise.
2014-11-15 03:21:48 -08:00
48c522a86b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-15 03:03:52 -08:00
8d6793060c
made early levels a little easier to progress through
2014-11-15 21:33:28 +11:00
2af66c99e7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-15 01:17:21 -08:00
df76f6be10
More work on Clans.
2014-11-15 01:13:14 -08:00
685a2899ca
Added custom name to wither disguise.
2014-11-15 01:12:58 -08:00
51bc53262d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-15 19:32:08 +11:00
ca4eec20ed
Wither Assault update
2014-11-15 19:31:56 +11:00
521b1e5f3b
Merge remote-tracking branch 'origin/master'
2014-11-13 21:54:15 -06:00
2cf76ae5b4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-13 19:15:05 -08:00
4812da2cd9
More work on Clans - Clan repository.
2014-11-13 19:14:56 -08:00
62fbeeda20
Added Wither disguise.
2014-11-13 19:14:14 -08:00
af31f4cd42
Add Tab handling for MultiCommandBase and "game set" command
2014-11-13 18:22:00 -06:00
48c09aa311
Making spectator gui look better
2014-11-13 18:05:28 -06:00
eb4b451e12
Fixing some spectator gui bugs
2014-11-13 16:41:42 -06:00
9eaacd20ab
fixed slime healing
...
fixed sheep quest brute not dropping sheep
updated punish page
2014-11-13 18:09:54 +11:00
c5a873ffab
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-13 14:40:26 +11:00
f9f7a834c2
geno morf
2014-11-13 14:38:33 +11:00
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
1372f74921
Refactored some names in MiniPlugin
...
Work on clans.
2014-11-12 19:21:12 -08:00
0193c397fb
Added Kit unlocks to staff server
...
Added password persistence in db.
2014-11-12 19:20:41 -08:00
2e848c2ac2
Fixed some of twiggy conflicts.
2014-11-12 05:13:58 -08:00
8d62966abc
Created Clans project.
...
Converted Fields code complete (not tested).
2014-11-12 05:13:16 -08:00
71a93bead5
Updated punish to be even less confuse.
2014-11-12 09:49:03 +11:00
d7141e4943
Added warning note to punish
2014-11-11 20:02:35 +11:00
f7ad986503
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-11-11 19:05:58 +11:00
c0f2f8a88c
Remove useless comment/import
2014-11-11 01:47:03 -06:00
23ab9756dc
Merge remote-tracking branch 'origin/master'
2014-11-11 01:32:55 -06:00
b08cd54666
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-10 23:31:38 -08:00
827fef535f
Some commented out testing code in DisguiseManager
2014-11-10 23:30:41 -08:00
108421164c
Added support for stats with spaces in them for GiveStat.
2014-11-10 23:30:16 -08:00
5b9b7347c6
Add tab complete processing for commands
2014-11-10 23:49:35 -06:00
6c6c51e950
fixed compilation problems
2014-11-11 14:28:35 +11:00
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
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
d362fb3b1c
fixed punish error
2014-11-10 19:15:56 +11:00
0252db5a05
Punish simplification update
2014-11-10 18:40:39 +11:00
d5515d11b2
fixed kick reason for bans
2014-11-09 14:27:01 +11:00
6405253b1c
added word wrap on punish text in GUI
...
only staff+punishee will now see punishments
2014-11-09 14:09:30 +11:00
3c39e3d93a
changed sev2/3 hack punishements
...
updated ban kick/login messages
2014-11-09 13:47:25 +11:00
a1f7fc5187
warnings are now friendly :)
...
reach hack detection base
2014-11-09 12:22:55 +11:00
2781bb3000
Removed stacking buffers.
2014-11-08 14:32:37 -08:00
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
4c98d833e0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-07 18:33:46 -05:00
96f54c2949
Made DBPool class uninstantiatable
2014-11-07 18:27:20 -05:00
24725eb22e
play a sound when you get punished
2014-11-08 10:15:46 +11:00
44fbd9fdd2
updated punishment output.
...
punishee is now informed of the reason in chat.
2014-11-08 10:11:12 +11:00
3a3c2002f5
fixed level exp requirements
2014-11-08 09:17:59 +11:00
c61ad8907a
set minimum MP level for staff
2014-11-08 09:15:27 +11:00
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
c93862f299
updated player level
...
added /givestat command for owners (must use full string; Global.ExpEarned)
2014-11-07 22:10:41 +11:00
f0099368d0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-11-07 01:27:16 -08:00
264df5af79
Fixed load time issue with ServerConfiguration.
2014-11-07 01:27:07 -08:00
c245f84593
increased exp per level in mineplex level achievemnet
2014-11-07 20:10:15 +11:00
fadaa59526
added mineplex level
...
removed ability to go into negative gems as villager morph
2014-11-07 19:20:15 +11:00
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
e3cd6f0e69
Fixed Mem leak in CustomTagFix
...
Changed to ServerGameMenu
Fix for overfilling HH servers
Added staff ability to join all servers.
2014-10-17 23:29:24 -05:00
075bc0af1d
Added gem rewards for MS achievements
2014-10-17 21:20:04 +11:00
2bbb29c8bb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-17 02:57:30 -05:00
f5efea1e9a
Missing files
2014-10-17 18:34:23 +11:00
6d38f4e238
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-17 00:42:01 -05:00
8466b8e2dd
Fixed building issues with EnjinTranslator
...
MAde mysql repo always record rank change even if windows return rank is different.
Added rough single player replay functionality.
2014-10-17 00:41:23 -05:00
248438535b
Preserve pitch and yaw in NpcManager teleportations
2014-10-16 22:31:09 -04:00
930cdf6c07
Hide NpcManager blank custom names
2014-10-16 22:24:24 -04:00
edb2c4f26a
Merge remote-tracking branch 'origin/master'
2014-10-16 22:15:20 -04:00
1fb21d6143
Fixed some NpcManager bugs
2014-10-16 22:13:41 -04:00
ec81e9f511
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
2014-10-16 17:51:32 -05:00
c855c46940
Add coin command for online players, better way to handle this soon
2014-10-16 17:46:00 -05:00
c30171d24f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-16 12:03:09 +11:00
233e6d0b46
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-15 20:44:50 -04:00
535506393f
Added ability to customize NPC zombie adulthood, slime size, and villager profession
2014-10-15 20:44:42 -04:00
76dc735b6b
Fix bug I was getting with ShopItem
2014-10-15 15:05:31 -05:00
82e95f714a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-15 16:57:38 +11:00
b83b0e61e6
fixed long lines in achievements
...
added night to halloween maps in parser
2014-10-15 16:57:25 +11:00
a6a4808222
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-15 00:27:01 -05:00
a81bdb4e32
Fixed bug with armor stands showing up for customNameVisible = false;
2014-10-15 00:26:36 -05:00
c3fdae135e
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-15 16:11:08 +11:00
25b10f0925
Added /npc refresh command to NpcManager
2014-10-15 01:04:52 -04:00
ed64c1972d
Update accountStats rows before inserting to prevent id column from skipping on failed inserts
2014-10-15 00:54:23 -04:00
d8a8061746
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-10-15 15:44:41 +11:00
eb5af41323
Added halloween reward pet
...
minor bug fixes
2014-10-15 15:44:26 +11:00
2a18888922
Improved NpcManager to work with persistent maps
2014-10-14 22:22:17 -04:00
256df99b7b
Added MineStrike to achievement gui
2014-10-13 23:48:38 -04:00
3ba748f2de
Merge branch 'feature/currency-log'
2014-10-13 23:13:44 -04:00
1dd51bcac5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-10-13 21:07:10 -05:00
Shaun Bennett
Chiss
Jonathan Williams
libraryaddict
Shaun Bennett
libraryaddict
MrTwiggy
CoderTim