Commit Graph

365 Commits

Author SHA1 Message Date
Chiss 4d6a0e2133 Ah no kick 2013-10-17 09:02:52 +11:00
Chiss d9ecbf4037 AH Update 2013-10-17 09:01:36 +11:00
Chiss d23f72567a fixed bug. 2013-10-16 17:22:28 +11:00
Chiss 9cdcbed086 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-16 12:24:02 +11:00
Chiss 2a836f3464 Added anti-hack 2013-10-16 12:23:23 +11:00
Jonathan Williams 483f8ffde3 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-15 14:20:45 -07:00
Jonathan Williams 9569c3906e Starting work on dynamic server. 2013-10-15 14:19:14 -07:00
Jonathan Williams 1a5f6a9b74 Coreclient fix. 2013-10-15 14:18:13 -07:00
Chiss 40e49dd3d4 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-16 08:11:04 +11:00
Chiss ec80d8a568 added AntiHack
added dragonrider coolness
2013-10-16 08:10:45 +11:00
Jonathan Williams c68bfce21a Fix for null pointer in core client cleanup 2013-10-14 12:20:49 -07:00
Jonathan Williams 922d269a52 Added core client cleanup in case of weird glitch from bungee 2013-10-13 22:40:06 -07:00
Jonathan Williams 1cdb89f4bf Derp, missing arcade. 2013-10-13 21:51:38 -07:00
Jonathan Williams 6c568cb7a9 Added MemoryFix to Arcade
Added Dipose override and task cancellation to Confirmationpage
Cleaned up unused code in Updater
2013-10-13 21:51:25 -07:00
Chiss 230ad4aa7b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-14 10:29:48 +11:00
Chiss 9ffc793f61 added Dragon Rider
anti-stack changes (dont anti-stack mined blocks)
2013-10-14 10:29:20 +11:00
Jonathan Williams 6dee9c983f Increased interval between sending restart commands from server monitor. 2013-10-13 02:25:17 -07:00
Jonathan Williams 1c1fb056a6 Memory leak fix for explosion blocks. 2013-10-13 01:27:41 -07:00
Jonathan Williams 25dec6fb46 Fixed player arm animation bug.
Added EnderDragon AI control and vegetation
2013-10-12 20:31:43 -07:00
Chiss 36b825d36d Snake update (woo) 2013-10-13 10:33:16 +11:00
Chiss d784a0b017 snake speed ramp up decrease 2013-10-13 09:38:03 +11:00
Chiss a34b6da238 even less blocks 2013-10-13 09:20:00 +11:00
Chiss bb39f18573 Explosion creates less blocks. 2013-10-13 09:18:49 +11:00
Chiss e12477c4b6 snake max speed decrease 2013-10-13 08:46:02 +11:00
Chiss 1fd894934a Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-13 08:43:06 +11:00
Chiss 377f4b0680 Gem fix, now correctly displays scaled gems.
UHC public changes
Snake fixes.
2013-10-13 08:42:49 +11:00
Jonathan Williams c5385ee7dc Fixed ultra join in arcade manager. 2013-10-12 02:53:22 -07:00
Jonathan Williams e723075298 Increased lobby menu size.
Fixed memory leak in Explosion
2013-10-12 02:52:35 -07:00
Jonathan Williams 03c74aa419 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-12 01:55:52 -07:00
Jonathan Williams 42b932e612 Added inventory move prevention for all inventories
Prevent bone from being turned into bonemeal and being fed to pet wolf.
Fixed Dominate shop in hub.
2013-10-12 01:55:32 -07:00
Chiss c8386bbc40 blue kit for snake 2013-10-12 18:22:20 +11:00
Chiss a315064a3f snake fix
parkour radius increase
2013-10-12 18:21:19 +11:00
Chiss 0564bd740a SSM wolf balance 2013-10-12 17:17:24 +11:00
Chiss 4eecca3063 Wolf fixes 2013-10-12 17:13:28 +11:00
Chiss 8766767d96 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-12 16:59:38 +11:00
Chiss 27fb3b4262 Snake changes
SSM Wolf fixes
2013-10-12 16:59:23 +11:00
Jonathan Williams f2c295c391 Fixed global ultra joining full games. 2013-10-11 22:03:17 -07:00
Chiss 0b2dcc2617 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-12 09:34:59 +11:00
Chiss 8376316994 Added Paintball
Added SSM Kit: Wolf
UPDATES.
2013-10-12 09:34:46 +11:00
Jonathan Williams 923a066013 Added ServerMonitor 2013-10-10 09:02:21 -07:00
Jonathan Williams fc18d0fbb1 Added null check logging to arcade custom kit name.
Removed wolf kit in SSM for release
Cleaned up PlayerAccountController
Fixed connection leak for mysql connections.
Added server shutdown if server is empty for dominate.
2013-10-10 09:01:48 -07:00
Chiss ed804e3336 Dragon escape update 2013-10-09 21:50:39 +11:00
Jonathan Williams ca4760a7d6 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-10-08 02:22:29 -07:00
Jonathan Williams 3999f80a79 Fixed Lobby balancer issue and null bungee connect.
Optimized lobby balancing based on connects per second.

Added Pet deactivation.

Possibly fixed asynchronous pet spawning as well.
TODO : Realized we are doing a lot of async stuff....stupid jon jon.
2013-10-08 02:22:04 -07:00
Chiss 1fc446ae13 Lobby text now displays map 2013-10-08 17:56:57 +11:00
Chiss b64803e499 Smash Wolf 2013-10-08 17:44:04 +11:00
Chiss e7de90c267 Bridge changes to allow for 12 team map
Bridge timer fix
Smash wolf remove
World parser allows more than 4 teams.
2013-10-05 22:14:57 +10:00
Jonathan Williams c9af91fcd6 Tweak on lobby to show number instead of player count in item. 2013-10-05 01:49:55 -07:00
Jonathan Williams 1431961b39 Fixed issues with Pet menu.
Fixed typo in Welcome Tutorial
2013-10-05 00:59:45 -07:00
Jonathan Williams f389378bd2 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-10-04 23:57:58 -07:00
Jonathan Williams 4ed1d97a33 Added missing pet buttons. 2013-10-04 23:56:16 -07:00
Jonathan Williams 59d7a78086 Revamped pet purchase and added pet menu to player hotbar.
Fixed ServerStatusManager still firing errors if IgnoreUpdates was in.
2013-10-04 23:55:05 -07:00
Chiss ab45c717dd Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-10-05 07:49:21 +10:00
Chiss 3ba848567c paintball added
hg additions
minor changes to other games
2013-10-05 07:49:05 +10:00
Jonathan Williams 57b0d06786 Added DisguiseWolf
Added lobby menu (disabled autogive for testing)
Removed unused commands.
2013-10-02 22:23:01 -07:00
Jonathan Williams 44da981cf4 Fixed dominate bug again.
Fixed quick game menu bug.
2013-09-27 23:06:53 -07:00
Jonathan Williams 86199d2795 Fix for dominate. 2013-09-27 20:05:30 -07:00
Jonathan Williams f9400a0eb4 Fixed multiple finishes for parkours 2013-09-27 12:45:24 -07:00
Jonathan Williams b6d33010ca - Lava parkour fire ticks are no more
- Lava gem rewards on npcs reflect actual value (1000 and 4000)
- Can't carry people into parkour areas now

Removed unused code with Portal
Added portal functionality for server quick join
Disabled SG text
Updated quick game menu text.
2013-09-27 12:40:09 -07:00
Chiss 894a121a2e Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-27 17:08:52 +10:00
Chiss 34521eef8f minor game fixes
portal method in StackerManager.java
2013-09-27 17:08:32 +10:00
Jonathan Williams 7c0e3bcc53 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-26 21:20:38 -07:00
Jonathan Williams b71ff09fb5 Fixed double server status manager in MK
Fixed tps of 0.
Fixed couple bugs in Shop/Conf page.
2013-09-26 21:18:31 -07:00
Chiss 2a3d7426d5 Some scoreboard fixes 2013-09-26 12:38:32 +10:00
Chiss f0e6a7294e squid hitbox larger 2013-09-24 09:18:36 +10:00
Chiss 0390d4f63b desc update suqid 2013-09-24 08:56:51 +10:00
Chiss 064dd97d00 HitBox support for disguises
Squid hitbox added
Changed squid swimming!
2013-09-24 08:56:09 +10:00
Chiss ea5cc7161a pigssss 2013-09-24 08:19:07 +10:00
Chiss d8d4b69dda baby pig to pig 2013-09-24 08:15:48 +10:00
Chiss 82f5fcb963 Pig Fix! 2013-09-24 08:12:51 +10:00
Jonathan Williams 68e068092f Fix for ageable. 2013-09-23 15:09:52 -07:00
Jonathan Williams 6d5acd29db Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
Conflicts:
	Plugins/Libraries/craftbukkit.jar
2013-09-23 13:53:28 -07:00
Jonathan Williams 10994924c2 Fixes for Bungee lobby balancer.
Exception handling in PlayerJoinEvents for hub (tracking a bug)
Fix in pages for shop.
Support eth1 private address setting in server status.

Fix for bug in ClientClass.
2013-09-23 13:30:40 -07:00
Chiss d4775a91a1 hitbox reduction 2013-09-23 17:45:14 +10:00
Chiss 0f9f28dcc2 fixed weapon names in pigs, + baby pig on platform 2013-09-23 17:36:53 +10:00
Chiss 5ba494c381 Made player names more visible in squid 2013-09-23 16:05:05 +10:00
Chiss ce89108aea Fixed disguises in bacon brawl 2013-09-23 16:00:35 +10:00
Chiss eae38dfa22 Merge branch 'master' of ssh://198.245.50.91:7999/min/master
Conflicts:
	Plugins/Libraries/craftbukkit.jar
2013-09-23 15:50:30 +10:00
Chiss bf4dc35b5f Added pig Game
added squid game
added recharged skill event
2013-09-23 15:48:35 +10:00
Jonathan Williams 8aad215475 Added sheep color/shear for disguise 2013-09-22 21:12:08 -07:00
Jonathan Williams e098d93155 Added baby disguise ability.
Added Stacker recharge.
Fixed issue with ServerGameMenu Champions button.
SuperSmash decreased hunger gain on attack.

Code cleanup.
2013-09-22 20:53:24 -07:00
Jonathan Williams cc63fdccfc Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-21 15:02:14 -07:00
Jonathan Williams 558d9b4cc6 Added shop link to kits.
REmoved client cache.
Added random messages.
Fixed problem with Confirmation Page.
2013-09-21 15:01:40 -07:00
Chiss b3a78112be Fixed gem display bug 2013-09-21 13:53:12 +10:00
Chiss eb6bbceecd Slowed hunger degen a little, increased regen to damage dealt. 2013-09-21 13:40:04 +10:00
Chiss 9064272a38 Prepared SSM for 200 player Game (added hunger) 2013-09-21 13:34:14 +10:00
Chiss 9da18ea43f Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-21 08:34:24 +10:00
Chiss a92c74a28a HG Updates
Other minor fixes
2013-09-21 08:34:07 +10:00
Jonathan Williams 85cc6e5b2b Updated to 1.6.4 2013-09-20 01:50:56 -07:00
Jonathan Williams 3622808e09 Fix for task cancelling. 2013-09-19 02:39:53 -07:00
Jonathan Williams d2ab872856 Added some code for Global bungee communication.
Fixed up LobbyBalancer
2013-09-19 00:05:23 -07:00
Jonathan Williams 7329cc0aea Implemented quick game menu.
Fixed dom team size at 1.

Removed old server update code from server manager.
2013-09-18 22:11:49 -07:00
Jonathan Williams 7d31b24c75 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-18 05:20:58 -07:00
Jonathan Williams 978254c16c Fixed dominate start issues.
Fixed issue with server status manager and config for server tracker.
Changed minekart mob name.

Updated Minekart with new server status stuff.
Updated Dominate with new server status stuff.
2013-09-18 05:16:29 -07:00
Chiss 91ce36d6e4 Hub refactor
Hub parkour module
2013-09-18 19:46:45 +10:00
Jonathan Williams ae00d3df18 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-17 15:52:16 -07:00
Jonathan Williams f31a734a0d Fixed server pages to show 5 servers.
Added in creeper explode block list for UHC.java
Added task assignment/reward message only on return confirm call.
Hide players in hub when they have an inventory open.
Added gem command into donation manager.

Revamped bungee player count method.
Revamped server status method.
2013-09-17 15:50:23 -07:00
Chiss f280fb51f2 Mute now blocks commands too. 2013-09-17 14:54:50 +10:00
Chiss c6a9d4675f MTC changes
Barbarians changes
OITQ enchanter desc improvement
renamed Turf Forts
Added 2.5x gems for bridges
2013-09-17 10:37:45 +10:00
Chiss c6b3a8a56c Added Minigames to hub TextCreator.java
Milk the cow changes!
2013-09-16 12:23:57 +10:00
Chiss 118d52e106 Slime Buff 2013-09-16 12:03:04 +10:00
Chiss 7bd13b416e Some turf forts fixes/changes
Fixed SSM lobby
2013-09-16 11:52:27 +10:00
Chiss 616ba6312c fixed bug with bomber not giving tnt 2013-09-15 15:27:50 +10:00
Chiss 6f03c57c22 Farmers lose 5 milk when dying. 2013-09-15 14:21:10 +10:00
Chiss 6b5373c20c Fixed Turf Forts arrow bug 2013-09-15 13:57:13 +10:00
Chiss 7894f95aab Milk Cow now has 3 cows
dragon escape backtrack fix
2013-09-15 13:43:56 +10:00
Chiss d51599de28 HG start
Added /hub and /leave to return to hub
2013-09-15 11:12:11 +10:00
Chiss cc39abfd7f UHC fixes
IdleManager NPE fix
2013-09-14 20:03:24 +10:00
Chiss 44b82f90b1 Shredder buff 2013-09-14 19:05:07 +10:00
Jonathan Williams c5f239baba Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-14 02:02:57 -07:00
Jonathan Williams 817fa5737c Added nether teleportation to game world. 2013-09-14 02:02:34 -07:00
Chiss 5ad627decb SSM Creeper shield nerf by 50% duration 2013-09-14 16:13:24 +10:00
Chiss 743c8e9978 SSM Blaze slight buff
Dragons: Removed knockback (based on feedback)
Dragons: added 3 mroe dragons :D
2013-09-14 16:09:30 +10:00
Chiss 72718ff7b4 nerfed farmer in milk teh cow
fixed some UHC bugs
made party tutorial return you to spawn
2013-09-14 15:20:28 +10:00
Chiss 34c333dac9 added announcement logging
fixed creeper explosion disable for uhc
fixed player logout thing for UHC?
2013-09-14 12:27:40 +10:00
Chiss e49b92d280 UHC fixes
Game inventory disable doesnt disable punish anymore
2013-09-14 11:33:33 +10:00
Chiss 9cac72dc1e Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-14 09:36:05 +10:00
Chiss 3ae6ba709d smash kit display update 2013-09-14 09:34:05 +10:00
Jonathan Williams c976a46f1f Optimized UtilText/MapUtil.java
Added quick game menu.  Still needs work.
2013-09-13 15:25:01 -07:00
Chiss 2fb200119e Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-14 08:13:37 +10:00
Chiss 35c10f22a1 Fixed gems in a few games
Milk Cow; cannot pickup water, cannot drink milk after end
2013-09-14 08:13:21 +10:00
Jonathan Williams 35728ce4d3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-12 22:33:43 -07:00
Jonathan Williams c4c81085c5 Added ignore check for bungee updating.
Fixed PlayerCount for bungee's
Fixed bug with Party.
2013-09-12 22:33:03 -07:00
Chiss 20090406a6 missing kit 2013-09-13 12:25:45 +10:00
Chiss b1744e86d8 many UHC bug fixes
dragon escape bug fixes
barbarians bug fixes
death tag fixes
2013-09-13 12:24:33 +10:00
Chiss 60dd6c84d0 Updated World Parser / Data to account for Y of corner blocks.
Use same height to have no height limits.
2013-09-12 09:01:37 +10:00
Chiss 9490549a96 Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-12 09:01:04 +10:00
Chiss 2a65086b70 Added Milk the Cow
Maps now set Min/Max Y
2013-09-12 08:57:51 +10:00
Jonathan Williams 4ec728d6cb Fixed party bug with expiring invitees. 2013-09-11 13:59:26 -07:00
Jonathan Williams a02b726303 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
2013-09-11 13:54:41 -07:00
Jonathan Williams d6bd962768 Added in dynamic servermanager updating.
Added updating of bungeeServers/servers list.
Combined all bungee plugins to Mineplexer

Fixed arcade bug on player quit.
Fixed ServersUI page errors.
2013-09-11 13:53:24 -07:00
Chiss ea81e558ea Added;
- Death Tag
- Dragon Escape
- Barbarians

Spleef; added hunger
Dragons; added knockback
Turf Forts; buffed shredder + fixed infil on respawn

Added knockack to 1 damage attacks.
Removed 'hit sound' from hitting mobs (just plays animal sound)
2013-09-11 12:22:55 +10:00
Jonathan Williams 0d98868a1f Fixed comparison issue in server page UI.
Added DisguiseBlock for disguises.
2013-09-09 18:42:20 -07:00
Jonathan Williams a6a32e45e0 Fixed player tag going on others. 2013-09-09 17:30:50 -07:00
Jonathan Williams 0f577c3f8c Added ultra tag in hub. 2013-09-09 17:17:55 -07:00
Jonathan Williams 645ae4cad8 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-09 17:10:43 -07:00
Jonathan Williams b90a6617f5 Fixed shops not opening and only showing 1 full green server. 2013-09-09 17:10:24 -07:00
Jonathan Williams 77a6c4c658 Fix for confirmation page NPE 2013-09-09 17:07:45 -07:00
Chiss c46a550282 restructured games in arcade 2013-09-10 07:56:55 +10:00
Jonathan Williams ecaca5d6fd just a little cleanup. 2013-09-09 02:07:20 -07:00
Jonathan Williams 6b7b6c9fdf Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2013-09-09 01:30:28 -07:00
Jonathan Williams d4b3c5d461 Fixed memory leaks.
Added in party joining for servers in Hub
Modified server status's in server UI.
2013-09-09 01:28:35 -07:00
Chiss 9fe33bab84 Added UHC
Added pig disguise
Added func to Game base to support UHC
Moved map to Core
2013-09-09 18:06:44 +10:00
Chiss 8b2cc7993f Added UHC
Disabled Join Maps
2013-09-08 19:31:58 +10:00
Chiss 64f4302008 More hub fix 2013-09-08 12:09:50 +10:00
Chiss e93a8c5a23 Map fix 2013-09-08 11:39:01 +10:00
Chiss 4419fe54c6 Hub Map update 2013-09-08 11:34:00 +10:00
Chiss 8dec407f16 SSM: wither image dies when you die
Turf Forts: you retain infil slow if you go onto enemy spawn
Hub Maps
2013-09-08 10:16:39 +10:00
Chiss f612826787 SSM: dont give passive item descs in game. 2013-09-07 19:30:06 +10:00
Chiss ff0e39067a Added Mount Manager 2013-09-07 16:01:10 +10:00