Commit Graph

2359 Commits

Author SHA1 Message Date
Jonathan Williams 419f33fcc3 Refactored AntiHack a bit to try and remove CCM 2014-12-29 07:07:05 -05:00
Jonathan Williams 97f57b655b Prevent horses from spawning in Clans
Added Building supplies shop and pvp shop to clans.
2014-12-29 06:44:00 -05:00
Jonathan Williams a7f77c09fe Work towards another memory fix. 2014-12-29 06:42:43 -05:00
Jonathan Williams 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
Jonathan Williams 2480361421 LightningOrb now strikes all living entities instead of just players. 2014-12-27 03:25:54 -05:00
Jonathan Williams d83a63ef57 Changed FriendManager to start supporting expiry friend requests. 2014-12-26 07:36:07 -05:00
Jonathan Williams 8702bafbd0 Changed storage to player names instead of Player object for CustomTagFix 2014-12-26 00:29:57 -05:00
Jonathan Williams 81e423fa4f Fixed Server transfer stuff. Portal send works! 2014-12-24 14:35:34 -05:00
Jonathan Williams 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
Jonathan Williams 6e93d85da8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-24 02:49:37 -05:00
Jonathan Williams 008980d9ca Slowed Server page update speed. 2014-12-24 01:36:33 -05:00
Shaun Bennett 5446557b89 Merge remote-tracking branch 'origin/master' 2014-12-23 17:48:59 -06:00
Shaun Bennett 043f67f78c Fix for max players not displaying properly (MPS) 2014-12-23 17:48:38 -06:00
libraryaddict adc5769890 Fix wither not accessible for ranks, fix wither having weird naming in inventories 2014-12-24 04:07:28 +13:00
Shaun Bennett d83b586a3a Merge remote-tracking branch 'origin/master' 2014-12-23 08:08:00 -06:00
Shaun Bennett cff63ca3e3 Phinary needs some sleep! 2014-12-23 08:07:46 -06:00
Jonathan Williams a1dd1b8753 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-23 08:08:48 -05:00
Jonathan Williams 5dcda626e7 Fixed port stuff for MPS 2014-12-23 08:08:41 -05:00
Chiss 1a3920d04a Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-23 23:45:11 +11:00
Chiss 35bcf28c83 champions builds will now load in MPS, even if the current game isnt champs. 2014-12-23 23:44:59 +11:00
Shaun Bennett 9c1e3aa7aa Ignore full or dead servers 2014-12-23 06:26:51 -06:00
Shaun Bennett d40b154902 Merge remote-tracking branch 'origin/master' 2014-12-23 06:20:43 -06:00
Shaun Bennett c40a5a8eac Another bugfix 2014-12-23 06:20:36 -06:00
Chiss 78977788a1 fixed bug 2014-12-23 23:18:29 +11:00
Chiss f4c5922b05 added messages for when server is expired 2014-12-23 23:17:21 +11:00
Chiss 78d94320a8 fixed reciptient of message 2014-12-23 22:55:07 +11:00
Shaun Bennett ea6214b2ad Merge remote-tracking branch 'origin/master' 2014-12-23 05:49:08 -06:00
Shaun Bennett 582ed34d21 Fix for staff hosted 2014-12-23 05:48:45 -06:00
Jonathan Williams 07cca7a1d4 Fixed NPE in GameHostManager
Fixed CD for creating server.
2014-12-23 06:46:05 -05:00
Chiss 4bfd34034b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-23 22:19:50 +11:00
Chiss 8c2d879036 added ownership of legend particle for legends. 2014-12-23 22:17:39 +11:00
Jonathan Williams 50993d19f3 Added Legend for Enjin 2014-12-23 06:07:14 -05:00
Jonathan Williams d2e078f890 Fixed ranks for MPS 2014-12-23 06:04:42 -05:00
Jonathan Williams 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
Jonathan Williams bb8b1d60f9 30 seconds recharge on ability to host locally. 2014-12-23 05:56:17 -05:00
Shaun Bennett 5f509ca488 Rank fixes, visual fixes, lets hope things work! 2014-12-23 04:55:00 -06:00
Shaun Bennett d8311d860e Ignore private servers 2014-12-23 04:21:37 -06:00
Shaun Bennett 21d255fcd1 Merge remote-tracking branch 'origin/master' 2014-12-23 04:15:55 -06:00
Shaun Bennett c41b5b0cfb private server gui, i think? 2014-12-23 04:15:33 -06:00
Chiss 6d2bd84b5b disabled always joinable motd for minestrike 2014-12-23 20:39:49 +11:00
Jonathan Williams 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
Jonathan Williams 9a767af018 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-23 03:44:05 -05:00
Jonathan Williams 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
Chiss 521b61c624 disabled free evolutions 2014-12-23 19:42:13 +11:00
Chiss 6b5b072ae8 missing file 2014-12-23 19:36:23 +11:00
Chiss 7496f64d58 benefit 2014-12-23 19:36:10 +11:00
Chiss a15256da88 update 2014-12-23 19:04:10 +11:00
Jonathan Williams 103ff0e6b0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-23 02:57:24 -05:00
Chiss 07d82b8206 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-23 18:39:22 +11:00
Chiss 39745913ac re-enabled roggue 2014-12-23 18:39:05 +11:00
Shaun Bennett 2a585936b7 Maybe I should test before I commit! 2014-12-23 00:37:29 -06:00
Shaun Bennett 2848ec2751 Use the correct data value this time! 2014-12-23 00:33:47 -06:00
Shaun Bennett 48fdfbb8f0 Hub changes for private servers 2014-12-23 00:30:15 -06:00
Shaun Bennett eb0f23318f Fix my fix for scoreboard - mine broke when new players joined 2014-12-23 00:06:30 -06:00
Shaun Bennett 4b4ebd0e36 Change admin item to sparkling melon 2014-12-23 00:06:04 -06:00
Shaun Bennett 8f9794a5f7 Merge remote-tracking branch 'origin/master'
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2014-12-22 23:56:18 -06:00
Shaun Bennett 706b3e25ef Fix broken player count when changing max players 2014-12-22 23:54:51 -06:00
Chiss 64d37d1886 minor snd changes 2014-12-23 16:50:31 +11:00
Jonathan Williams 4cac65a81f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-23 00:50:20 -05:00
Jonathan Williams 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
Shaun Bennett 1957db25d9 Add player head button 2014-12-22 23:20:20 -06:00
Shaun Bennett befc2cff7c messing with jedis subpub 2014-12-22 22:49:28 -06:00
Chiss e8953b0c96 fixed merge errors 2014-12-23 15:14:03 +11:00
Chiss f961fd0233 Merge remote-tracking branch 'remotes/origin/searchanddestroy'
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-12-23 15:09:58 +11:00
Chiss 0659f497c0 frost lord update 2014-12-23 15:00:32 +11:00
Chiss 19a7e6d666 time update 2014-12-23 13:01:44 +11:00
Shaun Bennett 8ed7f34ab6 Sorted game pages 2014-12-22 19:20:08 -06:00
Chiss 4797b251b1 YAY Champions enable/disable works. 2014-12-23 11:39:03 +11:00
Chiss 825b25e8d1 fixed my bug in miniplugin 2014-12-23 11:29:48 +11:00
Chiss 71cf8e8fd2 undid champs stuff :( 2014-12-23 11:22:41 +11:00
Chiss ec9401506c Game servers can now run champions/normal on the fly. 2014-12-23 11:18:48 +11:00
Chiss a197724de8 fixed le bugs. 2014-12-23 10:48:15 +11:00
Shaun Bennett 0f5c33fe52 derp derp chissderp 2014-12-22 17:41:12 -06:00
Shaun Bennett b51367f33b Add missing jooq classes 2014-12-22 17:40:04 -06:00
Shaun Bennett 31b040c654 Merge remote-tracking branch 'origin/master' 2014-12-22 17:37:10 -06:00
Shaun Bennett 1396c3395a Add kill button, rename ban to remove, add some messages for actions, add remove admin 2014-12-22 17:37:02 -06:00
Chiss 224d1bbf63 blizzard particle redo
hub text
2014-12-23 10:36:48 +11:00
Shaun Bennett 9a9936bc8c Allow animated motd to be enabled or disabled through database 2014-12-22 16:39:34 -06:00
Shaun Bennett 3efc80ec58 Update jooq database classes 2014-12-22 16:11:59 -06:00
Jonathan Williams b83a81ec7e Fixed little conflict issue. 2014-12-22 09:25:02 -05:00
Jonathan Williams 9b3350c8c7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-22 09:22:50 -05:00
Jonathan Williams d920439ec5 Clans update. Laying groundwork for energy 2014-12-22 09:22:10 -05:00
Chiss fa0a9ac859 fixed exploit on skylands 2014-12-22 21:08:44 +11:00
Chiss ec8e1f0546 more MPS stuff
fixed bridges exploit
2014-12-22 16:31:13 +11:00
Chiss 2472ca95ec MPS updates 2014-12-22 13:19:45 +11:00
Chiss 4a50e3ae62 Merge branch 'chissbrokethis'
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
2014-12-22 10:57:39 +11:00
Chiss 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
Chiss 0e7dec919d minor updates 2014-12-22 10:51:19 +11:00
Chiss 71f7b4c963 legend join messages 2014-12-22 10:40:06 +11:00
Chiss 1a56f074b3 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-22 10:22:13 +11:00
Chiss eba54c6b8a Removed hub snake parkour 2014-12-22 10:21:58 +11:00
Chiss 9321abdaf5 Merge branch 'searchanddestroy' of ssh://184.154.0.242:7999/min/mineplex into searchanddestroy 2014-12-19 13:59:31 +11:00
Chiss 184c6cb4ba added func to change attackreason for combatmanager 2014-12-19 13:59:18 +11:00
Jonathan Williams 52cc0862d7 Memory leak fix for CUSTOM TAG 2014-12-18 18:29:33 -05:00
libraryaddict 93314711e7 Modified snd 2014-12-18 17:56:21 +13:00
Shaun Bennett 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
Shaun Bennett 9ef0ea629c Added changes from master to Chat 2014-12-17 20:07:39 -06:00
Shaun Bennett 899add5fcd Merging changes from master
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
2014-12-17 20:07:11 -06:00
Chiss 437c1aeabe MPS rank todo 2014-12-18 13:06:57 +11:00
Chiss 60f567a3fb fixed some errors ;o 2014-12-18 12:47:00 +11:00