Commit Graph

2795 Commits

Author SHA1 Message Date
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 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 1c1fb056a6 Memory leak fix for explosion blocks. 2013-10-13 01:27:41 -07: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
Jonathan Williams e723075298 Increased lobby menu size.
Fixed memory leak in Explosion
2013-10-12 02:52:35 -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
Jonathan Williams f2c295c391 Fixed global ultra joining full games. 2013-10-11 22:03:17 -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
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
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 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
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 064dd97d00 HitBox support for disguises
Squid hitbox added
Changed squid swimming!
2013-09-24 08:56:09 +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 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 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 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 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
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 34c333dac9 added announcement logging
fixed creeper explosion disable for uhc
fixed player logout thing for UHC?
2013-09-14 12:27:40 +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 b1744e86d8 many UHC bug fixes
dragon escape bug fixes
barbarians bug fixes
death tag fixes
2013-09-13 12:24:33 +10:00
Chiss 2a65086b70 Added Milk the Cow
Maps now set Min/Max Y
2013-09-12 08:57:51 +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 0f577c3f8c Added ultra tag in hub. 2013-09-09 17:17:55 -07:00
Jonathan Williams 77a6c4c658 Fix for confirmation page NPE 2013-09-09 17:07:45 -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 213b1efb0c Added Dragon Escape
fixed kit availability for runner
SSM: wither skel projectile continues after releasing block
SSM: nerfed blizzard
SSM: reduced gem price of a few kits
2013-09-06 15:58:58 +10:00
Chiss 768f57ae5e SSM: Added Wither Skeleton and Creeper kits
Compass: no longer teleports if not holding compass (on click)
SSM: various balance changes.
2013-09-05 13:55:42 +10:00
Jonathan Williams 9121d429c2 Added armor show/hide for insentient disguises. 2013-09-04 19:56:43 -07:00
Jonathan Williams 97405f6cfa Fixed NPE in SkillPage
Added some timing debug text // for now
Changed utiltext setting method.
2013-09-04 18:52:08 -07:00
Jonathan Williams 34dd5a1af3 Added broadcast command.
Added Chat to hub.
Disabled /me
Fixed Pets not returning when pushed off into the void.
Prevented eggs from spawning in hub.
2013-09-04 11:35:59 -07:00
Jonathan Williams d5ef0208a1 Added lag meter to hub and arcade. 2013-09-03 23:31:29 -07:00
Jonathan Williams b894aea72a Fixed login speeds.
Implemented Tasks for Tutorial
Removed compiled files for website.
2013-09-03 11:34:28 -07:00
Jonathan Williams cec476c72d Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-03 08:52:20 -07:00
Jonathan Williams d16b674f46 Memory cleanup (Recharge, ClassCombatShop)
Implemented Tasks.
2013-09-03 08:51:44 -07:00
Chiss 83567fce50 SSM slime nerf
disguise 0 velocity packet fix
2013-09-03 10:47:15 +10:00
Jonathan Williams 74dba53e32 Fixed ignore update. 2013-09-02 16:24:04 -07:00
Jonathan Williams 5aec6509ca Fixed shop inventory loss bug.
Added IgnoreUpdate.dat file check for testing with FileUPdater.
Fixed bug in SkillPage
Fixed bug in ClassCombatShop
Disabled dragon spawning in hub.
2013-09-02 16:20:14 -07:00
Jonathan Williams 59f2b9ebc8 Memory cleanup with all MiniPlugins.
Added Dragon.
Cleanup memory with Class Restore
2013-09-02 05:37:33 -07:00
Jonathan Williams 8840f04977 Fixed FileUpdater.
Added FileUpdater to DOM and Arcade.
2013-09-02 04:19:56 -07:00
Jonathan Williams d0098b8a46 Removed double jump effect for surrounding players in hub.
Disabled Dragon spawning in HubManager.java(pending fix)
Fixed priority on MOTD for FileUPdater.
2013-09-02 01:16:29 -07:00
Jonathan Williams af7a41ae71 Implemented ServerRestart event on FileUpdate check.
Implemented cancels in arcade/dom/mk
Implemented Restart updates in server manager page.

Implemented lobby removal is restarting.
2013-09-02 01:09:28 -07:00
Jonathan Williams 63d2563f92 Added Disguise hurt sounds.
Enabled disguised hurt sounds in DamageManager
2013-09-01 23:28:07 -07:00
Jonathan Williams a49f67b33c Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-01 22:06:35 -07:00
Jonathan Williams f0b0c72ddb Fixed arcade packethandler problem.
Fixed skill page issue for class combat.
2013-09-01 22:06:20 -07:00
Chiss c483d869a5 Added SSM Spider and Squid Kit
prepared DamageManager.java for disguise sounds
minor SSM balance changes
fixed compass targetting self.
2013-09-02 14:40:06 +10:00
Jonathan Williams 3041cacb26 Renamed disguise methods to lowercase. 2013-09-01 16:38:32 -07:00
Jonathan Williams 07ad83fa41 Added getDisguise
Renamed new methods to lowercase.
2013-09-01 16:35:17 -07:00
Jonathan Williams 181f3d4746 Added to DisguiseManager:
-ReApplyDisguise
-UpdateDisguise
-IsDisguised
2013-09-01 16:30:17 -07:00
Jonathan Williams 148c288d4f Fixed shop bug affecting server menu and class setup in hub. 2013-09-01 16:17:44 -07:00
Jonathan Williams d14b21d29f Removed VoteHub.java
Added commons codec to all build paths for Ant
Fixed pet shop new name.
Added send all for Portal.
Updated Hubmanager
2013-08-31 20:28:35 -07:00
Jonathan Williams e3fa648fc9 HUb minekart rider disguise.... 2013-08-31 02:01:41 -07:00
Jonathan Williams c0198b1b1f Fixed vegetate...derp. 2013-08-31 01:36:40 -07:00
Jonathan Williams 0f4facd407 whitespace gone. 2013-08-31 01:29:52 -07:00
Jonathan Williams e530e3b5a8 Fix for npc vegetate. 2013-08-31 01:29:32 -07:00
Chiss 81f8503180 Merge commit '13110356aabbcc69d83ce29d8f9e5bec27812009'
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/deathtag/kits/KitArcher.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitCoward.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitMarksman.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitPyrotechnic.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitDefenceArcher.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitHorseKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitBrawler.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitElementalist.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitLeaper.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitInfiltrator.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitMarksman.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitShredder.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanElementalist.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanMarksman.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanPeasant.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorArcher.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorRogue.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitUndeadAlpha.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2013-08-31 13:41:58 +10:00
Chiss e17368a9ac >.< Updates 2013-08-31 13:15:16 +10:00
Jonathan Williams 13110356aa Added Enjin Translator poll ability.
Fixed up kits for arcade.
Fixed disguise for enderman to not teleport on fire ticks.
2013-08-30 16:37:21 -07:00
Jonathan Williams 90de0c3ed2 Added LobbyBalancer for BungeeCord
Added EnjinTranslator for automatic shop.
Removed enjin module from Hub
Tweaked donation/punish/accountadministrator for shop automation.
2013-08-30 01:36:55 -07:00
Jonathan Williams bb2af17856 Cleaned up files. 2013-08-30 01:26:12 -07:00
Chiss 8559e77a24 "UPDATES!"loooooooool 2013-08-29 16:13:05 +10:00
Jonathan Williams a1d622c790 Tweaked disguise movement to cut out jitters. 2013-08-28 15:00:39 -07:00
Jonathan Williams cb48c2a037 Test for git push. 2013-08-27 16:47:58 -07:00
Jonathan Williams 1b7b549647 Removed class files from source control. 2013-08-27 16:21:57 -07:00
Jonathan Williams c9dd8d87eb Fixed DOm crash issue on game start.
Added Teleport to Hub
Fixed DisguiseManager bleeding over.
Fixed Teleport sub commands
2013-08-27 16:03:04 -07:00
Jonathan Williams 3fb52c5c71 Initial Commit 2013-08-27 08:14:08 -07:00