JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,476 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

5275 Commits

Author SHA1 Message Date
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 66131ad0b0 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-02 04:20:18 -07:00
Jonathan Williams 8840f04977 Fixed FileUpdater. 
Added FileUpdater to DOM and Arcade.
 2013-09-02 04:19:56 -07:00
Chiss ad26c519ba Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-02 18:45:31 +10:00
Chiss 45d28569e0 Added idle fix 
fixed hub Dragon.java
ate the rabbit stew.
 2013-09-02 18:45:12 +10: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 43c3f8cc87 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-01 23:28:22 -07:00
Jonathan Williams 63d2563f92 Added Disguise hurt sounds. 
Enabled disguised hurt sounds in DamageManager
 2013-09-01 23:28:07 -07:00
Chiss 441e6d80b7 lobby kit disguises :D 
slime NPE fix
 2013-09-02 16:01:14 +10:00
Chiss ee20174d80 lobby adv messagfe 2013-09-02 15:47:08 +10:00
Chiss d5fd95c53b Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-02 15:07:27 +10:00
Chiss 98b285d819 turf forts self kill fix. 2013-09-02 15:07:07 +10: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
Chiss 789a26471d smash stats Perk 2013-09-02 09:51:53 +10:00
Jonathan Williams 3041cacb26 Renamed disguise methods to lowercase. 2013-09-01 16:38:32 -07:00
Chiss 4607b2fdcd Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-02 09:35:44 +10:00
Chiss 3384d8e057 Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-02 09:35:27 +10:00
Jonathan Williams 07ad83fa41 Added getDisguise 
Renamed new methods to lowercase.
 2013-09-01 16:35:17 -07:00
Chiss 668a6e4854 changed utilplayer health method to double 
spleef eventhandelr removal
turf forts kit green/blue
added kit stats for smash
nerfed flap in smash
 2013-09-02 09:35:04 +10:00
Jonathan Williams 181f3d4746 Added to DisguiseManager: 
-ReApplyDisguise
-UpdateDisguise
-IsDisguised
 2013-09-01 16:30:17 -07:00
Jonathan Williams e4e861d568 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-01 16:18:39 -07:00
Jonathan Williams 148c288d4f Fixed shop bug affecting server menu and class setup in hub. 2013-09-01 16:17:44 -07:00
Chiss 75ced1a033 hub animals die in void 
hub invis doesnt remove from list
 2013-09-02 08:24:37 +10:00
Chiss 96f6862bd1 Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-02 08:17:08 +10:00
Chiss 9149cc565e Hub turns off flight (people were staying in flying somehow) 
Spleef block damage fix
Smash kit balances
 2013-09-02 08:16:35 +10:00
Jonathan Williams 5380899cfe Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2013-08-31 20:30:18 -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
Chiss 07dcfeb266 Compass in smash 
can break windows in OITQ
block toss cannot dig tunnels, or take from walls.
chicken missile fixes
remove fire ticks from players on respawn
 2013-09-01 12:18:48 +10:00
Chiss 72bec77237 Queueing now works with less players than teams. 
Added DragonName text-input for hub
Fixed smash bug, where spectators were causing lightning effect
 2013-09-01 08:34:53 +10:00
Chiss 30c5267da2 removed castel siege 2013-08-31 21:31:09 +10:00
Chiss 329953b2b7 dragon update 2013-08-31 20:49:20 +10:00
Jonathan Williams 2174c958d9 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-08-31 02:57:12 -07:00
Jonathan Williams 9d56abdcbc Fixed hub build file. 2013-08-31 02:56:58 -07:00
Chiss 1a929082a1 Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-08-31 19:52:12 +10:00
Chiss dd44b982f9 Added hub dragon 2013-08-31 19:51:59 +10:00
Jonathan Williams 86f47cbd9e Fixed sterling npc. 
Enabled champion shops.
 2013-08-31 02:36:31 -07:00
Jonathan Williams 300981524d Added owner disguises 2013-08-31 02:25:06 -07:00
Jonathan Williams ff75bc1207 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-08-31 02:01:55 -07:00
Jonathan Williams e3fa648fc9 HUb minekart rider disguise.... 2013-08-31 02:01:41 -07:00
Chiss b74c11cd36 Minor text hub changes 2013-08-31 18:57:33 +10: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 e18239f89a Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-08-31 18:19:55 +10:00
Chiss dab3f33cbf Hub text changes 
Hub animal spawns
Hub spawn invisibility
Smash kit balances
 2013-08-31 18:19:23 +10:00
Jonathan Williams 50ea1867e9 Added slime vegetate. 
Fixed dominate changes.
 2013-08-31 01:16:39 -07:00
Jonathan Williams 68b7e0e3fa Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-08-30 20:59:23 -07:00
Chiss 6ee2e427b5 Changed TeamEntity from Creature to LivingEntity 2013-08-31 13:58:40 +10:00
Jonathan Williams 63b3cf501f Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-08-30 20:58:27 -07:00
Jonathan Williams 0f7828092c Added missing craftbukkit files. 2013-08-30 20:57:46 -07:00
Chiss fb592640a1 Fixed various merge errors. 
(Updates)
 2013-08-31 13:47:48 +10: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 da08321de4 Added possible second option for pulling purchases to Enjin plugin. 2013-08-30 09:45:25 -07:00
Jonathan Williams 6302869c02 Fixed up lobby balancer. 2013-08-30 02:24:39 -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
Jonathan Williams 57d1d8058c DOM-12 2013-08-29 10:04:39 -07:00
Jonathan Williams 606f631559 Fixed up MK 2013-08-28 23:21:59 -07:00
Chiss 7dbfe9d0dc Moremissing stuff. 2013-08-29 16:20:36 +10:00
Chiss aad017690e FIREFLY 2013-08-29 16:17:52 +10:00
Chiss a198d0d3cb Added events... 2013-08-29 16:16:22 +10:00
Chiss 8559e77a24 "UPDATES!"loooooooool 2013-08-29 16:13:05 +10:00
Jonathan Williams 873c32c359 Added missing files. 2013-08-28 22:57:27 -07:00
Jonathan Williams b638957517 Removed more class files. 
Fixed DOM-22, DOM-20, DOM-19, DOM-17, DOM-14, DOM-7, DOM-3, DOM-1
 2013-08-28 22:26:40 -07: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