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

5612 Commits

Author SHA1 Message Date
Chiss
b868db0f22 Fixed so you can now charge bow skills in air. 2014-04-09 19:07:12 +10:00
Jonathan Williams
e4ca9084cc Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-09 02:03:41 -07:00
Jonathan Williams
ec29c66d1c Added arrows sticking in you. 
Removed bouncing arrows.
 2014-04-09 02:03:19 -07:00
Chiss
146202a52c Champs Balance + Red Arrow Fix 2014-04-09 18:50:38 +10:00
Chiss
7d59f43ffa Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-09 16:48:14 +10:00
Chiss
0ecd38c656 Champs Balance 2014-04-09 16:48:01 +10:00
Jonathan Williams
bedabd84cc Added silence to kits (UtilEnt.silence) 
Cleaned up a ton of unused code....
 2014-04-08 23:31:32 -07:00
Jonathan Williams
e8260b20f7 Fixed dragon spawn location for text util. 2014-04-07 23:35:45 -04:00
Jonathan Williams
9b4e1aa9eb Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-07 22:25:08 -04:00
Jonathan Williams
109d2cb6f1 Fixed edit build issue. 2014-04-07 22:18:04 -04:00
Chiss
2eaaa85e04 Fixed /game stop trapping players in dead world. 2014-04-08 12:08:59 +10:00
Chiss
bb3f2c6281 CHAMPS 2014-04-08 10:53:41 +10:00
Chiss
85c57f2942 IButton now has Left/Right 
Added right-click skill removal.
 2014-04-06 12:45:52 +10:00
Jonathan Williams
88131836d7 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-05 16:01:07 -04:00
Jonathan Williams
db2ae49074 Fixed saving custom builds. 
Work on skill tokens.
 2014-04-05 15:53:22 -04:00
Chiss
8214e3b8f4 Lots of little bug fixes 2014-04-05 16:52:23 +11:00
Jonathan Williams
05d916de3c Fixed custombuild selection not applying armor 2014-04-04 15:57:56 -04:00
Jonathan Williams
ddcc8a26b3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-04 15:02:42 -04:00
Jonathan Williams
edfe23fb01 Fixed collision with Projectiles. 2014-04-04 15:02:13 -04:00
Chiss
13b8f1e7ea Champs Update 2014-04-04 13:26:00 +11:00
Chiss
26fe974b00 More CHamps 2014-04-03 15:48:58 +11:00
Chiss
80c153095b Cooldown bar 2014-04-02 22:03:56 +11:00
Chiss
2f0167ea09 Champs Update 2014-04-02 21:22:21 +11:00
Chiss
2aaf749414 Champions Update 2014-04-02 15:19:58 +11:00
Jonathan Williams
afc26e21e3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-29 18:46:52 -04:00
Jonathan Williams
06bdc22c89 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-29 18:45:53 -04:00
Chiss
0f937b165c skill shop stuff 2014-03-30 09:45:53 +11:00
Jonathan Williams
d227a6bd06 Changed full server message 2014-03-29 18:45:44 -04:00
Chiss
e1eda749a7 Skill lore changes 2014-03-30 09:05:29 +11:00
Jonathan Williams
b7857ef20c Fixes for Skill level desc. 
Fix for level staying same across skill changes.
Removed logging statements in ClientClass
 2014-03-29 02:49:57 -04:00
Chiss
f4e8879d55 skilly test stuff 2014-03-29 17:07:07 +11:00
Jonathan Williams
195e555a6e Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-29 01:33:18 -04:00
Jonathan Williams
6963f6bacf Added Player version stat tracking. 
Added server group stats.
 2014-03-29 01:32:24 -04:00
Chiss
fce249d7d8 fixed some desc stuff 
castle seige removed OP kit
 2014-03-28 18:50:38 +11:00
Chiss
4386ce0b96 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/ISkill.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java
 2014-03-28 14:55:13 +11:00
Chiss
f5ca6408f8 Merge? 2014-03-28 14:51:26 +11:00
Jonathan Williams
aae40d3899 Changed up Skills and SkillsPage for Dom 2 changeover. 
Fixed CustomBuild stuff.
 2014-03-27 22:17:31 -04:00
Chiss
47feabcad3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-03-28 10:06:03 +11:00
Jonathan Williams
17e6658437 Fixed up AntiHack database reporting. 2014-03-24 01:16:02 -07:00
Chiss
2680edbd85 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-03-24 16:15:29 +11:00
Jonathan Williams
2450265909 Fixed damage rate limiting for mobs. 2014-03-22 00:16:51 -07:00
Chiss
e4a86e0600 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-03-22 10:45:01 +11:00
Chiss
fe09c3fc49 More CS Update 2014-03-22 10:44:31 +11:00
Jonathan Williams
8bf78fe14d Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-21 15:30:06 -07:00
Jonathan Williams
33d342b049 updated 1.7 stuff. 2014-03-21 10:57:31 -07:00
Chiss
ab2a72ba16 CS Update 2014-03-21 11:59:56 +11:00
Jonathan Williams
f24f81b7c3 Finished conversion. 2014-03-19 04:09:40 -07:00
Jonathan Williams
515a01fd7d Updated utils. 2014-03-19 02:40:36 -07:00
Jonathan Williams
7f58453688 Updated Particle. 2014-03-19 02:25:28 -07:00
Jonathan Williams
7042159f46 Updated to 1.7 and changed namespaces to 1.7 2014-03-19 02:24:26 -07:00
Jonathan Williams
98baef09bf Added 1.7 files. 
Removed 1.6 files.
 2014-03-19 00:58:43 -07:00
Chiss
a7888b0c02 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-03-19 17:51:48 +11:00
Chiss
7714ff4a09 CS Update 2014-03-19 17:51:37 +11:00
Jonathan Williams
24f1c6c722 Fixed saving custom builds. 
Fixed items staying from previous class in game.
 2014-03-18 23:40:54 -07:00
Jonathan Williams
9715f5454a Removed double gems. 
Removed unused code for ssm time
 2014-03-18 12:55:04 -07:00
Chiss
6830033d8a PLEASE JUST WORK :( 2014-03-16 10:52:34 +11:00
Chiss
d6e3f076cd PLEASE JUST WORK MR TORTOISE 2014-03-16 10:42:30 +11:00
Chiss
3277a0a2f8 Making sure puushed 2014-03-16 10:35:58 +11:00
Chiss
d695ec72ca Added SSM Team Game 2014-03-16 10:28:46 +11:00
Jonathan Williams
3603d3ef8b Removed afk kick from arcade. 2014-03-14 21:49:01 -07:00
Jonathan Williams
0094c0ebeb Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-14 02:20:01 -07:00
Jonathan Williams
246f28a464 Enabled DoubleGem weekend. 
Added 3 new maps
updated news
 2014-03-14 02:19:52 -07:00
Chiss
aa206d9c91 Gravity fixes 2014-03-14 20:17:06 +11:00
Chiss
24efe3d0d8 SQ kit restrictions 2014-03-14 13:24:38 +11:00
Jonathan Williams
de1365b5cf Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-13 17:56:16 -07:00
Jonathan Williams
efee9fdcbf Fixed Hub class shop. 
Added chat logging.
Added message with file updater.
 2014-03-13 17:56:05 -07:00
Chiss
f4cd2fcbb9 Staggered game teleports/start 2014-03-13 18:18:22 +11:00
Chiss
27f554ab61 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-03-13 16:33:03 +11:00
Chiss
82644002c5 A little bit o dem ol bug fixles. yknow what im sayin? 2014-03-13 16:32:48 +11:00
Jonathan Williams
b6ee99596a Work on Dom shop page. 
Removed unused shops

Removed unnecessary include of Core project files in build xml
 2014-03-12 01:06:56 -07:00
Jonathan Williams
c4b7cd19c8 Added default builds for kits in Champions/Dominate 
Added default build selection in lobby when only hitting kit and not selecting a build.
 2014-03-11 03:29:11 -07:00
Jonathan Williams
f277b1da23 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-09 19:43:14 -07:00
Jonathan Williams
02a1e68c8c Fixed kits opening correct page. 2014-03-09 19:42:54 -07:00
Chiss
105b210afa mob spawnin' 2014-03-10 13:42:05 +11:00
Chiss
464fdb1e5e Renamed Champions to Dominate 2014-03-10 13:35:36 +11:00
Chiss
8593eb326e Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-03-10 13:32:52 +11:00
Chiss
1bc5fef625 Kit npc location change 2014-03-10 13:32:39 +11:00
Jonathan Williams
a565da45e4 Added classes to champions. 
Added ability to open direct classes page.
 2014-03-09 19:32:27 -07:00
Jonathan Williams
f51a6747fd Moved files into Mineplex.core 
Removed references to Core project.
 2014-03-09 00:50:13 -08:00
Jonathan Williams
2cc50d5725 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-03-06 02:15:46 -08:00
Jonathan Williams
d05c2f906c Fix for ServerNpc page beta join. 
Work on Dom 2.0

Added sheep quest map.
 2014-03-06 02:15:16 -08:00
Chisstop
60bc3f15bb Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-03-05 14:35:01 -08:00
Chisstop
c9a938d2c5 Sheep Quest Fixes 2014-03-05 14:34:51 -08:00
Jonathan Williams
a09a2aaa30 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-03-05 00:40:51 -08:00
Jonathan Williams
f0b347f97f Changed beta testing to Ultra and up. 
Did some work on DOM 2.0
 2014-03-05 00:34:20 -08:00
Chisstop
af2cf4e7a9 this is the one change i needed to push 2014-03-04 23:27:37 -08:00
Chisstop
2b56b970fa Sheep Game? 2014-03-04 22:39:48 -08:00
Jonathan Williams
d99a3c9253 Optimized mysql queries with server status' address/updated fields. 
Removed double gems.
Added BETA check for Hero only beta games.
 2014-03-03 12:47:57 -08:00
Jonathan Williams
b3f10b9d62 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-03-01 01:59:25 -08:00
Jonathan Williams
750fff32c7 Added Skeletal horse. 2014-03-01 01:58:58 -08:00
Chiss
b54e4dfbc4 hunger 2014-03-01 11:29:01 +11:00
Chiss
18880a00f4 fletcher doesnt give to specs 2014-03-01 11:09:15 +11:00
Chiss
dfa4ea0edc fix 2014-03-01 11:06:01 +11:00
Chiss
8d0115f874 News update 2014-03-01 10:40:55 +11:00
Chiss
bfaa138526 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2014-03-01 10:35:20 +11:00
Chiss
7cf6391ddd Sheep Quest 
Double Gem Weekend
 2014-03-01 10:35:06 +11:00
Jonathan Williams
8550307904 Removed unnecessary mysql call on client login. 2014-02-28 13:22:30 -08:00
Jonathan Williams
c2044f7e8a Added horse disguise. 
Added Hub redirect on full.
Fixed Repo for ServerMonitor.
Fixed Bridge QuitOut/AutoBalance issue.

Removed unnecessary region folder create in dominate.
 2014-02-28 01:18:32 -08:00
Jonathan Williams
f2570caad5 Swapped default connections to new dns names. 
Fixed bug with LobbyBalancer and retrieving no lobbies.
 2014-02-21 13:32:14 -08:00
Jonathan Williams
55c9a85763 Fixed Dynamic Server monitor stuff. 
Fixed EnjinTranslator Gem command.
 2014-02-18 00:40:41 -08:00
Jonathan Williams
ac8748312f Fixed Account login issues....Nasty LoadNavigationProperties() 
Tweaked dynamic server monitor sleep ordering to prevent multiple duplicate starts on boxes.
 2014-02-14 13:39:24 -06:00
Jonathan Williams
95210de788 Added auto restart for Dominate if startup errored. 
Added extra check for <= 1 players in Dom game to shutdown.
Added 5 second delay to Dom kick after game finish.
 2014-02-12 02:31:35 -08:00
Jonathan Williams
a75ced170c Added whitelist check in CoreClientManager 2014-02-10 02:04:20 -08:00
Jonathan Williams
525df6c2b0 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-02-07 09:46:54 -08:00
Jonathan Williams
516e5f7f99 Moved Rejoin ability into TeamGame. 
Added autobalance flag for game.
Punish only does exact name lookup.
 2014-02-07 08:50:13 -08:00
Chiss
b776c1bf60 spacehelemettts 2014-01-22 08:28:06 +11:00
Chiss
d868c9b73d fixed gold blocks being destroyed. 2014-01-22 08:02:01 +11:00
Chiss
567b7c4a7b minor fixes 2014-01-21 23:14:23 +11:00
Chiss
9118e79d9a Minor fixes 2014-01-21 22:57:49 +11:00
Chiss
b0ea211ae3 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2014-01-21 22:52:05 +11:00
Chiss
e124dde006 Finished Gravity 
INcluded map
 2014-01-21 22:48:18 +11:00
Jonathan Williams
6f43d91bcf Added Vegetate for Bat. 
Added missing ProcessRunner.java
 2014-01-20 21:01:52 -06:00
Jonathan Williams
0fba94f8ae Derp 2014-01-20 20:22:59 -06:00
Jonathan Williams
f657b8a3ac Added isFlying and setFlying to DisguiseBat 2014-01-20 20:18:09 -06:00
Chiss
bdb7f3cc28 UHC season 5 2014-01-21 11:56:35 +11:00
Chiss
76b2baf626 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2014-01-21 11:28:37 +11:00
Chiss
7bbfdd1a42 Gravity Update 2014-01-21 11:28:12 +11:00
Jonathan Williams
dea96a9e65 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-01-18 09:08:12 -06:00
Jonathan Williams
177f4a878b Removed bad eventhandler line 
Refactored StatsManager
Removed Pvp Table add for StatsManager
Added commented out hooks for HG stats
 2014-01-18 09:02:56 -06:00
Chiss
75669e2333 Hub News Changes 
AntiHack Autokick for Severe Hackers
 2014-01-18 20:33:38 +11:00
Chiss
1333f2ee9f SSM Horse Disabled 2014-01-18 12:56:00 +11:00
Chiss
1031846198 SSM Update 
Gravity game start
 2014-01-18 12:34:24 +11:00
Jonathan Williams
8e51e4061a Reverted Hub. 
Fixed server monitor issues.
 2014-01-14 02:04:06 -06:00
Jonathan Williams
ea320e7f5b Removed Client cleanup. 
Modified server monitor process handling.
 2014-01-08 15:18:52 -05:00
Jonathan Williams
6904f9cf3d Minor verbage "Starting in 1 Second." 
Fixed NPE in client cleanup.
 2014-01-03 05:50:05 -05:00
Jonathan Williams
faea1072a1 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-01-03 01:37:49 -05:00
Jonathan Williams
93c0575fe2 Fixed naming in some hub modules. 
Fixed StatusManager ip and DynamicServer comparison.

Tweaked Bungee Lobby selection so it doesn't select a Lobby with < 10 slots left
Added client cleanup in CoreClientManager
Added Paintball cleanup
Added AntiHack ignore list cleanup.
Added clearDisguises call in DisguiseManager
Added ServerMonitor tracking based on Private Address.
 2014-01-03 01:37:39 -05:00
Jonathan Williams
dd7b178a9f Fixed Hero rank in EnjinTranslator 2013-12-26 19:44:36 -05:00
Chiss
fa2e24d686 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
 2013-12-25 09:08:03 +11:00
Chiss
375d689cc6 fixed visual bug with hero gems 2013-12-25 09:06:22 +11:00
Jonathan Williams
3fefc8fa73 Fixed Hero message in Arcade. 2013-12-24 04:13:52 -05:00
Chiss
f510083e7e formatting 2013-12-24 19:26:30 +11:00
Chiss
d25487d545 Rank color 2013-12-24 19:21:21 +11:00
Chiss
d92515eef9 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-24 19:14:54 +11:00
Chiss
74e49a3ff1 Hero Rank stuff 
New SSM Kit
 2013-12-24 19:14:40 +11:00
Jonathan Williams
592d49e57c Added ghost check flag to ender dragon. 
Re-enabled Dragon Gadget.
 2013-12-24 03:09:15 -05:00
Jonathan Williams
6595d33899 Tuned chunk load for disguise manager. 
Disabled dynamic text in hub.
 2013-12-24 00:39:33 -05:00
Jonathan Williams
e60f52ff9c Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-23 04:17:06 -05:00
Jonathan Williams
79de7f2bfc Fixed portal breaking with Frost horse. 
Added memory clean up for disguises
 2013-12-23 04:16:53 -05:00
Chiss
200504ec8b made snowman boss a little tougher. 2013-12-22 00:10:15 +11:00
Chiss
b895c66005 snake even more easy 2013-12-22 00:02:38 +11:00
Chiss
3bd7a7cd1f Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-22 00:01:24 +11:00
Chiss
2f063e9f8e wave 3 snowman invul fix 2013-12-21 23:54:10 +11:00
Jonathan Williams
a02ca4513e Added undead/batgun and frost to in game shop for gems. 2013-12-21 07:29:04 -05:00
Chiss
e94784a908 dragon mount removed 2013-12-21 23:09:49 +11:00
Chiss
d6c37055da cleaner leak fix. 2013-12-21 23:06:27 +11:00
Chiss
1c3d90a70f leak fixes 2013-12-21 23:00:51 +11:00
Chiss
58e049acf9 snake bit is easier :) 2013-12-21 22:34:04 +11:00
Chiss
c08b7c7b96 hub news update 2013-12-21 22:21:16 +11:00
Chiss
bfd76474e8 Dragon particles 2013-12-21 20:44:56 +11:00
Chiss
a6eb7ea665 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-21 20:07:04 +11:00
Chiss
0585116e78 Hub Gadgets 
Hub Dragon (Hero Only)
XMAS block efficiency
 2013-12-21 20:05:42 +11:00
Jonathan Williams
793b17e878 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-21 03:23:07 -05:00
Jonathan Williams
7574a5972b Prevented sounds from silenced vegetables. 2013-12-21 03:22:58 -05:00
Chiss
c969775df3 Hub gadgets for xmas 2013-12-21 19:00:30 +11:00
Jonathan Williams
5fffcf89b6 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-21 02:44:20 -05:00
Jonathan Williams
70c14268e1 Fixed Leash issue. 
Added invis for utilent.ghost
 2013-12-21 02:44:12 -05:00
Chiss
f50ae06dff NPE fix 2013-12-21 16:52:59 +11:00
Chiss
50c2b10b50 25% easier boss 2013-12-21 15:10:17 +11:00
Chiss
c52a7d2fe1 Christmas update 
Hub Update
 2013-12-21 15:06:01 +11:00
Chiss
bc9c309aa1 Xmas Game 2013-12-21 10:17:22 +11:00
Chiss
5dc0a7d4d6 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-21 08:43:02 +11:00
Chiss
ac723c14bd Push so i can pull :O 
just some xmas stuff
 2013-12-21 08:42:49 +11:00
Jonathan Williams
f504cb5a8d Added vegetation to horse. 
Added Leash method to UtilEnt
 2013-12-20 03:52:43 -05:00
Jonathan Williams
379b0d0d75 Check for PullWhileLeashed in EntityCreature. 2013-12-20 03:14:18 -05:00
Jonathan Williams
44145e01f0 Removed weather for hub update. 2013-12-18 13:52:44 -05:00
Jonathan Williams
a24e8e233c Enabled pvp in hub for snowballs. 2013-12-18 05:56:59 -05:00
Chiss
6b33306755 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-18 21:46:40 +11:00
Jonathan Williams
e55885c85d itsy 2013-12-18 05:22:40 -05:00
Chiss
f4edcedce3 push so i can pull :\? 2013-12-18 21:17:28 +11:00
Jonathan Williams
0ba8349e03 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-18 04:48:24 -05:00
Jonathan Williams
64dab19003 Cleanup 
Prep work on leash disable functionality.
 2013-12-18 04:48:16 -05:00
Chiss
54f2cb3467 Christmas hub snowman target cancel 2013-12-18 19:58:39 +11:00
Jonathan Williams
ab8013091d Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2013-12-17 11:10:11 -05:00
Jonathan Williams
938e72b06d Remove tourney stats. 2013-12-17 11:09:36 -05:00
Chiss
de99a642d3 Hub tourney text removal 2013-12-17 11:06:04 +11:00
Chiss
4bef100c6a Xmas Hub 2013-12-16 14:32:51 +11:00
Chiss
c582b210b5 Hub + Stats + Tournament 2013-12-14 16:51:08 +11:00
Chiss
3ca67d60c0 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-14 16:38:46 +11:00
Chiss
9af8676307 Hub/Stats 2013-12-14 16:38:16 +11:00
Jonathan Williams
ac049e0397 FINE JUST FINE>>>>>> STUPID CHICKENS 2013-12-13 21:36:57 -08:00
Jonathan Williams
69fa9eaba5 Added getters for stats/StatsManager.java 2013-12-13 21:35:04 -08:00
Jonathan Williams
e054b06cc2 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-13 21:01:08 -08:00
Jonathan Williams
6b92b6c4a8 Added stats manager. 
Added lots of missing files.
 2013-12-13 21:00:56 -08:00
Chiss
1eebed737e Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
 2013-12-13 18:05:08 +11:00
Chiss
5f2e457362 Minor HG Stuffs ;o 2013-12-13 16:21:39 +11:00
Jonathan Williams
d6544202f0 Added ghost ability for mobs. 2013-12-12 02:19:58 -08:00
Chiss
97d8923678 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-07 23:04:59 +11:00
Chiss
2fb4bc4fbc UHC stuff 2013-12-07 23:04:10 +11:00
Jonathan Williams
9382271315 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-06 01:57:18 -08:00
Jonathan Williams
03627eb0c3 Changed all mysql connections to be persistent. 2013-12-06 01:57:09 -08:00
Chiss
db7b4f3a40 more draw words 2013-12-04 15:25:18 +11:00
Chiss
00bccdc1f7 More draw words 
UHC complete! probably not :'(
 2013-12-04 13:31:23 +11:00
Chiss
a29cc4664f Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
 2013-12-04 12:48:12 +11:00
Chiss
28c928b4c3 Xmas + UHC changes 2013-12-04 12:45:17 +11:00
Jonathan Williams
8984309c56 Cleaned up portal cancellation. 2013-12-03 17:41:58 -08:00
Jonathan Williams
022c343a98 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
 2013-12-03 13:58:28 -08:00
Jonathan Williams
09a77e98cc Prevent Enderdragon from creating portal. 2013-12-03 13:57:43 -08:00
Chiss
36a98d5e41 UHC changes 2013-12-03 21:31:02 +11:00
Chiss
f972418fd1 UHC! 2013-12-03 17:13:29 +11:00
Chiss
d10871abd9 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-03 16:27:12 +11:00
Chiss
43196dd7af UHC Update 2013-12-03 16:26:47 +11:00
Jonathan Williams
ce4eb43145 UHC end transfer. 2013-12-02 21:20:28 -08:00
Jonathan Williams
27c79e7c92 Turned lobby balancer back to US 
Added Draw map
 2013-11-30 16:38:02 -08:00
Chiss
f4e3b6efdc hub news/skytext for draw game 2013-11-30 22:11:26 +11:00
Chiss
c8fc792fdd UHC prep for s4 
Draw updates
 2013-11-30 20:40:09 +11:00
Chiss
8807854b57 Added Draw 2013-11-29 23:38:38 +11:00
Chiss
f927f2c1be wolf tackle fix 
HG furnace no use
 2013-11-27 12:48:16 +11:00
Chiss
0d811272cc final HG fix :D 2013-11-27 11:52:20 +11:00
Chiss
6f06ac2018 HG lag fixes 
item frames cannot be broken
creep damage messages
 2013-11-26 23:54:02 +11:00
Jonathan Williams
25782813f4 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-26 02:35:05 -08:00
Jonathan Williams
9a7a815a21 Added multiblock packets only for sg. 
RE-tweaked loot.
Fixed blocks pawns in lobby.
 2013-11-26 02:34:54 -08:00
Chiss
e57722ed0b HG snowball fix 2013-11-26 12:02:03 +11:00
Chiss
48e392fdf0 HG; 
-compass
-deathmatch
-various fixes
 2013-11-25 20:59:46 +11:00
Chiss
e469c5705b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-25 10:23:28 +11:00
Chiss
b941359840 HG 2013-11-25 10:23:10 +11:00
Jonathan Williams
2ebf13aba6 Added commented out chunk change stuff. 2013-11-24 15:22:29 -08:00
Jonathan Williams
e2646a982f Added MultiBlock packet. 
Tweaked performance for chunks that are < 64 changes for HungerGames.
 2013-11-24 04:54:41 -08:00
Jonathan Williams
0a1f4ecfd5 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-24 03:04:07 -08:00
Chiss
276898dced HG 2013-11-24 21:58:55 +11:00
Jonathan Williams
8d19f3ecac Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-24 02:44:59 -08:00
Jonathan Williams
dbd7820279 Loot tweak. 2013-11-24 02:44:52 -08:00
Chiss
4c7e42760b debugz 2013-11-24 21:44:43 +11:00
Chiss
83bec39aef game not end 2013-11-24 21:36:35 +11:00
Chiss
c9e1c0a0f4 HG lag fix 2013-11-24 21:29:49 +11:00
Chiss
fd63a0a0b1 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-23 23:59:04 +11:00
Chiss
2a41979277 HG Lag Fixes! 2013-11-23 23:58:51 +11:00
Jonathan Williams
e04815f077 Removed Beta ultra only checking in server NPc page. 2013-11-23 02:40:56 -08:00
Jonathan Williams
b0bfa860c7 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-23 02:04:30 -08:00
Jonathan Williams
ae779d063e Added quick menu buttons for Block Hunt and Survival Games 2013-11-23 02:04:22 -08:00
Chiss
f299b4f650 hub changes 2013-11-23 20:55:01 +11:00
Jonathan Williams
7752d0e8a2 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-23 00:57:54 -08:00
Jonathan Williams
11378f967f Fixed npc page ultra beta stuff. 2013-11-23 00:39:32 -08:00
Chiss
0d7444f35a TNT Damage off 2013-11-23 19:38:58 +11:00
Chiss
e6080c9192 drop fixes 2013-11-23 18:39:26 +11:00
Chiss
d5ae42910f OOPDOOTS 2013-11-23 18:19:26 +11:00
Chiss
11bd4804f4 skeleton/wolf removal on death 2013-11-23 11:03:52 +11:00
Chiss
8752a7a6ac HG Ice Speed + TNT Delay 2013-11-23 10:21:06 +11:00
Chiss
3a3ac9f8ce redblockstore 2013-11-23 10:04:37 +11:00
Chiss
189b22ab4c Pushed fixes 2013-11-23 09:55:48 +11:00
Chiss
6e1f88c14f Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-23 09:28:39 +11:00
Chiss
42cab3a39c HG STUFF 2013-11-23 09:28:27 +11:00
Jonathan Williams
8a5e9e2f48 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-22 14:17:07 -08:00
Jonathan Williams
affc9eeb9c Added inventory click for creative users in Hub 
Added Ultra/Survival games beta stuff do servernpcpage
 2013-11-22 14:17:00 -08:00
Chiss
a5a80378f7 Loot fixes 2013-11-23 09:15:13 +11:00
Chiss
3d13fb0dc9 HG Fixes 2013-11-22 23:12:39 +11:00
Jonathan Williams
9c9e5f1ae0 Added goal selector clear for entities in UtilEntity 2013-11-22 00:38:24 -08:00
Chiss
0b7bf00ca7 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-22 18:41:31 +11:00
Chiss
0a683416ff SG Update 2013-11-22 18:40:38 +11:00
Jonathan Williams
7885df35ae Added spectating flag for EntityTNTPrimed 2013-11-21 23:32:41 -08:00
Jonathan Williams
9e8cd9db7d Disabled painting in parkour areas. 2013-11-21 12:38:16 -08:00
Jonathan Williams
44416001b3 Disabled Bat Blaster near Parkour. 
Disabled Painting blocks near cactus.
 2013-11-21 12:16:24 -08:00
Jonathan Williams
be7ea65033 Website bin/obj cleanup 
Fixed Pet Rename problem.
Fixed Extra Pet tag problem.

Added ServerStatus for dedicated servers.
 2013-11-21 12:08:58 -08:00
Jonathan Williams
4bd4943bd8 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-17 17:00:20 -08:00
Jonathan Williams
9ba122a4cb Added recursive retrieval for Bungees 2013-11-17 17:00:12 -08:00
Chiss
7aec2d572b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-17 21:04:51 +11:00
Chiss
18c70901ca gem kit fix 2013-11-17 21:04:27 +11:00
Jonathan Williams
0fa953715e Fixed interact cancel in Hub. 2013-11-16 18:49:17 -08:00
Chiss
fff13a14bf Gem lowered on firework/meow 2013-11-17 12:31:13 +11:00
Chiss
0aae7d24ed BH Gem Fixes 2013-11-17 12:30:14 +11:00
Chiss
85a3edc75e Mute should now correctly block all command input too. 2013-11-17 11:04:54 +11:00
Chiss
be4de5f7bb Europe server in news 2013-11-17 10:59:02 +11:00
Chiss
e91ed271c2 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-17 09:54:06 +11:00
Chiss
630281c663 SSM Hunger Fix 2013-11-17 09:53:53 +11:00
Jonathan Williams
3a725246dc Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-16 02:59:35 -08:00
Jonathan Williams
c1de12a8e7 Added autoreconnect to bungee repos 
Fixed up disguise for block hunt.
 2013-11-16 02:59:28 -08:00
Chiss
07d9610bf7 Hub sky text 2013-11-16 21:21:04 +11:00
Chiss
2a9c11d700 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-16 21:10:23 +11:00
Chiss
1e0a456286 hub changes 2013-11-16 21:09:59 +11:00
Jonathan Williams
a9241bc7f3 Changed Hub to normal. 2013-11-16 02:07:51 -08:00
Jonathan Williams
3f93e6daf1 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/CreatureForm.java
 2013-11-16 01:56:22 -08:00
Jonathan Williams
75c2a5fd6e Added sound disguises 
Removed purchasable batgun.
 2013-11-16 01:55:10 -08:00
Chiss
9c6ebcea52 shocking nerf 2013-11-16 18:25:19 +11:00
Chiss
37ed58cea9 axe boost nerf 2013-11-16 17:57:21 +11:00
Chiss
690811dd05 cased SG debug properly 2013-11-16 17:54:30 +11:00
Chiss
b8e1c22967 BH updates 2013-11-16 17:53:42 +11:00
Chiss
d71a8002d3 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-16 17:11:05 +11:00
Chiss
ea8d28abc1 Formula 2013-11-16 17:10:54 +11:00
Chiss
ef54732531 DISGUISE THEM CATS 2013-11-16 16:43:03 +11:00
Jonathan Williams
39384470e7 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-15 21:41:23 -08:00
Jonathan Williams
84acc952fa Added DisguiseCat. 
Added CookieTown Block Hunt.
 2013-11-15 21:41:14 -08:00
Chiss
2e6758e23c BH Updates 2013-11-16 13:15:16 +11:00
Chiss
29ce493f64 Hide and SEEEEEEK (block honts) 2013-11-15 18:52:46 +11:00
Chiss
99c97d1ecd Block Hunt changes 2013-11-14 16:28:29 +11:00
Chiss
0013b1bacf Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-14 16:28:06 +11:00
Jonathan Williams
115109e5b8 Added sound disguise for DisguiseBase 
Small desc tweak on server monitor.
 2013-11-14 00:01:41 -05:00
Chiss
6ebda931fd Fixed bug where backtracking players could be in the scoreboard twice. 2013-11-11 07:27:41 +11:00
Jonathan Williams
980ce0a5a3 Block disguise velocity tweak. 2013-11-08 16:06:17 -08:00
Chiss
255307088c Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
 2013-11-09 10:03:49 +11:00
Chiss
3c5b1fe74f H&S Updates 
some punish fixes
hub toggles no longer pulse on pressure plate
 2013-11-09 09:48:40 +11:00
Jonathan Williams
ef0d233512 Dynamic server tinkering again. 2013-11-08 14:46:05 -08:00
Jonathan Williams
cae10fe7b4 Fixes to DynamicServer Monitor 
Fixed SSM disguise clunky movement.
 2013-11-08 10:52:56 -08:00
Chiss
dc062c7bb6 H&S Push 2013-11-07 19:49:21 +11:00
Jonathan Williams
79b739fc14 Project for servermonitor 2013-11-07 00:22:42 -08:00
Jonathan Williams
7cc880afd1 ServerMonitor tweaks. 2013-11-07 00:22:04 -08:00
Chiss
8fa7b9f283 Helpers can use WARNINGS 2013-11-07 17:03:34 +11:00
Jonathan Williams
e27f01e916 Fixed punish constructor bugs for dom/mk 2013-11-06 21:36:00 -08:00
Jonathan Williams
079a58d2cd Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-06 20:38:41 -08:00
Jonathan Williams
f8567dcfa6 Fix for scoreboard uppercase issue in hub. 2013-11-06 20:38:33 -08:00
Chiss
8e7b5ac6fe Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-07 15:26:37 +11:00
Chiss
6b577af7b4 Punish Update 
H&S Additions
 2013-11-07 15:25:46 +11:00
Jonathan Williams
49e796c39d Fixed Game.Core build issue. 
Cleaned up a lot.

Added missing files for Mineplexer
 2013-11-06 20:19:56 -08:00
Jonathan Williams
e0d10f6550 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-06 19:48:27 -08:00
Jonathan Williams
41e9ffb018 Removed BungeeSigns 
Updated Bungee plugin to pull US servers only.
Added dynamic MOTD from mysql for BungeeCord.jar

Fixed crash for disguise block arm animation.
 2013-11-06 19:48:00 -08:00
Chiss
0d5b174ebe Stacker/Party exceptions for YouTubers 2013-11-07 10:33:39 +11:00
Chiss
9f11352f10 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-07 10:19:30 +11:00
Chiss
03731de7f8 Rank changes 
MAC no longer kicks lag/fly
some H&S stuff :O
 2013-11-07 10:18:36 +11:00
Jonathan Williams
70dae64389 added missing file. 2013-11-06 10:26:33 -08:00
Jonathan Williams
0a50d9b127 ServerMonitor files. 2013-11-06 09:14:08 -08:00
Jonathan Williams
9327e71519 MOre work on dynamic server baby! 2013-11-06 01:03:02 -08:00
Jonathan Williams
ff6488b371 safe file separators 2013-11-05 16:10:14 -08:00
Jonathan Williams
43d5b6441b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-05 10:19:17 -08:00
Jonathan Williams
2064c58d1b Fixed up ServerStatusRepository to insert into specific columns 
Fixed Dominate shop.

Some work on Server Monitor
 2013-11-05 10:19:04 -08:00
Chiss
bcb86fc911 PB gem for healing remove 2013-11-04 09:46:09 +11:00
Chiss
e14bc76639 arcade map directory up up right left down up right update! 
some paintball fixes
H&S start
 2013-11-04 08:59:29 +11:00
Jonathan Williams
6999d7979f Added paintball to LobbyMenu 
Fixed Lobby count in lobby menu
Fixed ultra/green kits in Paintball
 2013-11-02 12:26:28 -07:00
Jonathan Williams
a468ac1ae0 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-02 00:59:39 -07:00
Jonathan Williams
b9560cf4da Work on Dynamic server monitor. 2013-11-02 00:56:31 -07:00
Chiss
1545873f62 news feed for hub 2013-11-02 18:56:21 +11:00
Chiss
0cbefc1280 Paintball update! 2013-11-02 15:42:37 +11:00
Chiss
24723cd5e5 paintball update 2013-11-02 10:09:07 +11:00
Chiss
c72f1337e8 fixed memory leak in antihack 2013-11-01 10:40:33 +11:00
Chiss
08497e474d mobs no longer move as soon as they spawn. GET IN LINE BOYS! 2013-11-01 08:34:32 +11:00
Chiss
7dcd58ec2d HH debug prints 2013-11-01 08:27:45 +11:00
Chiss
d41338b76a Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/Champions.java
 2013-10-31 17:38:44 +11:00
Chiss
ae4bf75485 Champs update 2013-10-31 17:36:41 +11:00
Jonathan Williams
7b8608de95 Rah Rah, Custom Class Combat in Arcade! 2013-10-30 23:35:24 -07:00
Jonathan Williams
bac425235d Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-30 20:26:08 -07:00
Chiss
52ac670f3f More dom changes 2013-10-31 12:43:54 +11:00
Chiss
386e2e3067 Added Champs 
MAC update
 2013-10-31 09:45:11 +11:00
Jonathan Williams
a307a4854f Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-28 18:45:19 -05:00
Chiss
33c7d594a0 robin hood regen nerf 2013-10-29 10:43:04 +11:00
Chiss
ad487e48bd THIS IS HALLOWEEN THIS IS HALLOWEEN 2013-10-29 10:41:53 +11:00
Jonathan Williams
7279f58b92 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-28 08:53:36 -05:00
Jonathan Williams
c70b5c712b Fixed crash items in Server Game Menu for Hub 2013-10-28 08:52:32 -05:00
Chiss
ab9cce3910 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-28 22:31:03 +11:00
Chiss
91ec162c88 slightly easier 2013-10-28 22:30:51 +11:00
Chiss
3142bd517d Fixed regen aura... wasnt working at all 2013-10-28 21:35:16 +11:00
Jonathan Williams
9d47864503 Fixed player count in bungee plugin 2013-10-28 03:24:18 -05:00
Jonathan Williams
afee32257d Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-28 02:22:30 -05:00
Chiss
f0f7a4156f saving heads to file 2013-10-28 17:53:25 +11:00
Jonathan Williams
4306d2444f Updated bungee library 
Fixed server ping Event.java
Removed crash item in hub.
 2013-10-28 01:37:23 -05:00
Chiss
980b6420fe fixed stacker item for 1.7 2013-10-28 15:48:06 +11:00
Chiss
09a8cbe558 re-enabled waves 2013-10-28 14:08:55 +11:00
Chiss
1d4f902298 HH CPU fixes 2013-10-28 13:54:10 +11:00
Chiss
505dd57715 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-27 15:25:12 +11:00
Chiss
4974fc17aa Halloween balance (slightly easier) 
Giant hitbox improved
 2013-10-27 15:24:28 +11:00
Jonathan Williams
845535991d Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-26 16:37:07 -05:00
Jonathan Williams
0aee445e00 Added timeout check for status retrieval 2013-10-26 16:36:48 -05:00
Chiss
7948fa6f71 cpu fix ;o 2013-10-27 06:21:43 +11:00
Chiss
3892cd13f7 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-27 05:32:34 +11:00
Chiss
c9a295d56e Halloween event changes final 2013-10-27 05:32:21 +11:00
Jonathan Williams
1781ed15c4 Fixed some drop item stuff. 2013-10-26 12:02:18 -05:00
Jonathan Williams
95449fec26 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-26 11:06:19 -05:00
Chiss
64e98c4a30 text now has glowstone behind it (for darkness) 2013-10-27 03:05:19 +11:00
Jonathan Williams
7d8e79a234 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-26 11:01:22 -05:00
Jonathan Williams
88eab4b1a3 Fixed gadget item slot. 
Fixed some desc on mounts
 2013-10-26 11:01:01 -05:00
Chiss
d4affc8bb6 paintballs wont change near portals. 2013-10-27 02:53:38 +11:00
Jonathan Williams
df36145800 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ItemGadget.java
	Plugins/Mineplex.Hub/src/mineplex/hub/mount/types/Mule.java
 2013-10-26 10:47:14 -05:00
Jonathan Williams
0b0fa383f6 Finished up Gadget shop. 2013-10-26 10:45:41 -05:00
Chiss
935599030b moved witch (so its not default kit) 2013-10-27 02:44:14 +11:00
Chiss
9a025eb540 Potion rename 2013-10-27 02:37:11 +11:00
Chiss
55de25fded removed testing toggle for mount 
changed item gadget slot from 2 to 3
 2013-10-27 02:22:38 +11:00
Chiss
f838452b5c uncommented waves 2013-10-27 01:46:46 +11:00
Chiss
19e2946ce4 mule rename 2013-10-27 01:44:18 +11:00
Chiss
b4e2145ad7 giant speed decrease 
ghast teleports back if it flies too far away.
 2013-10-27 01:43:41 +11:00
Chiss
cd2c9dcdda more tips 2013-10-27 01:20:10 +11:00
Jonathan Williams
9bc9cc2bb8 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_Helmet.java
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ArmorGadget.java
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/Gadget.java
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ItemGadget.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/MobGhast.java
 2013-10-26 08:53:38 -05:00
Jonathan Williams
39cf5c3ed1 Tweaking on ghast. 
Added gadget costs
Working on Gadget shop.
 2013-10-26 08:50:12 -05:00
Chiss
c672e68713 some help during boss fight. 2013-10-27 00:14:38 +11:00
Chiss
7eb1cc6519 Halloween game additions 2013-10-27 00:06:44 +11:00
Chiss
01cb69d28b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-26 19:01:41 +11:00
Chiss
723b57cd46 Added paintball gun Gadget 
Added bat blaster Gadget

Halloween Game near-completed

Added SSM Witch
 2013-10-26 19:01:26 +11:00
Jonathan Williams
ca3979f4fa Added witch disguise hurt sound 2013-10-25 20:12:01 -05:00
Chiss
8958b8998f Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-26 11:35:02 +11:00
Chiss
a52bd69558 Witch SSM 2013-10-26 11:34:05 +11:00
Jonathan Williams
5470f847a9 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-25 19:06:43 -05:00
Jonathan Williams
8883855297 Added witch disguise 
Added missing files.
 2013-10-25 19:05:26 -05:00
Chiss
49e8c15f44 important update 2013-10-25 22:56:28 +11:00
Chiss
e8ddfc266e fsd6gty72 tjn6g wgh 2013-10-25 22:20:46 +11:00
Chiss
61b7a86b67 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-25 21:25:36 +11:00
Chiss
b74b8e3915 Halloween event changes 2013-10-25 21:25:23 +11:00
Jonathan Williams
e5f99331dd Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-25 05:16:15 -05:00
Jonathan Williams
c3754d766b Added in vegetate check for EntityGhast. 2013-10-25 05:15:17 -05:00
Chiss
5563d94111 Halloween event update 
hub News
hub mounts
hub gadgets
 2013-10-25 19:20:14 +11:00
Jonathan Williams
21128eb153 Prepping filterChat and CoreClientManager for mysql 
Removed get all clients at server start.
 2013-10-23 16:36:13 -05:00
Chiss
1977572ced Added Halloween Minigame 
Updated gadgets and other minor things.
 2013-10-22 15:46:31 +11:00
Chiss
7cec55713c Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-19 16:52:27 +11:00
Chiss
1944c0003c Hub gadgets 2013-10-19 16:52:15 +11:00
Jonathan Williams
985ce795d2 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-18 00:50:49 -07:00
Jonathan Williams
90fbc397ff Converted gem rewards to boolean return from website. 
Implemented gem transactions and source.
 2013-10-18 00:46:06 -07:00
Chiss
02258b9fd3 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-18 09:12:19 +11:00
Chiss
882ede9a21 tp ah exception 2013-10-18 09:09:29 +11:00
Jonathan Williams
7e77f78d2f Removed all client list pull. 2013-10-17 00:54:14 -07:00
Jonathan Williams
43b42f771a Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
 2013-10-17 00:40:06 -07:00
Jonathan Williams
f88c202e07 Added AntiHack to Arcade/Hub 
Added AntiHack Offense uploading.
Fixed memory leaks in PreparedStatments
Added Ultra tag in hub chat.
 2013-10-17 00:37:57 -07:00
Chiss
410e08b06a Clearer MAC reporting to staff 2013-10-17 09:05:03 +11:00
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
Chiss
a24a80e5a5 Merge branch 'master' of ssh://198.245.50.91:7999/min/master 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2013-09-07 14:13:08 +10:00
Chiss
7ab04be00c Added Hub Parties 
Re-did Hub Tutorials
Added Party Tutorial
 2013-09-07 14:09:12 +10:00
Jonathan Williams
7a9a3fea4f Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-06 17:43:59 -07:00
Jonathan Williams
2266cc4556 Added stop override and player redirect to Hub 
Added prevention of items going into inventory for ServerNpcPage
Fixed issue with ClientClass and Competitive ULTRA
Fixed issue with CustomBuildPage and Competitive ULTRA
Added ULTRA joining full servers for Arcade.
Added ULTRA packs displaying in Arcade chat/tab.
Removed IChat from TeamGameEngine and Dominate.
 2013-09-06 17:43:45 -07: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
Jonathan Williams
9fcda443e1 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-05 02:12:24 -07:00
Jonathan Williams
4b1d6756e2 Added missing PlayerCount project. 2013-09-05 02:12:12 -07:00
Jonathan Williams
22ee1522c1 Added DynamicServer for bungee. 
Added reload commands for balancer, dynamicserver, playercount.
Added depends for lboby on dynamic server.
 2013-09-05 02:11:47 -07: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
Chiss
f29b844798 Merge branch 'master' of ssh://198.245.50.91:7999/min/master 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
resolved
 2013-09-05 07:50:13 +10:00
Chiss
87fa103711 WHITE SPACE CHANGES! 2013-09-05 07:44:53 +10: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
55b6bd6e95 Fixed memory leaks in SSM kits. 2013-09-04 10:46:33 -07:00
Jonathan Williams
552675b1bf Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-04 10:36:13 -07:00
Chiss
010336983a SSM: fixed fissure not working 
Hub: fixed invisibility for tutorial players (others could still see them and throw em)
 2013-09-04 18:03:01 +10:00
Jonathan Williams
2a2c48087f Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-03 23:31:44 -07:00
Jonathan Williams
d5ef0208a1 Added lag meter to hub and arcade. 2013-09-03 23:31:29 -07:00
Chiss
93e59c1c43 Merge branch 'master' of ssh://198.245.50.91:7999/min/master 
Conflicts:
	Plugins/Libraries/craftbukkit.jar
 2013-09-04 16:13:12 +10:00
Chiss
ca6131d1d5 SSM Minor patches 2013-09-04 16:11:50 +10:00
Chiss
48c4ca0e24 SSM minor changes 2013-09-04 15:40:02 +10:00
Jonathan Williams
37897037a3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-03 20:46:48 -07:00
Jonathan Williams
63b4776893 Garrrr, fixed craftbukkit building. 2013-09-03 20:43:32 -07:00
Chiss
f07c23b99b Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-04 11:57:36 +10:00
Chiss
e3eae200ae arcade: fixed kit material NPE 
SSM: added knight
SSM: added placeholder for wither skel
 2013-09-04 11:55:19 +10:00
Jonathan Williams
e63b4b8d66 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-09-03 17:30:25 -07:00
Jonathan Williams
5a30173aba Updated craftbukkit. 2013-09-03 17:29:50 -07:00
Chiss
23ac045a41 Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-04 08:14:20 +10:00
Chiss
6b57a87285 SSM Kit Item Lore 2013-09-04 08:13:59 +10:00
Jonathan Williams
346bdb030e Cleaned warning. 
Fixed punish command on web side.
 2013-09-03 14:10:14 -07:00
Jonathan Williams
c2ec238af5 Fixed kit purchase in SuperSmashMobs 2013-09-03 12:13:15 -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
564c1720bd SSM Balances 2013-09-03 19:18:56 +10:00
Chiss
83567fce50 SSM slime nerf 
disguise 0 velocity packet fix
 2013-09-03 10:47:15 +10:00
Chiss
f2a58ab029 Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-09-03 10:17:06 +10:00
Chiss
835d78e0e7 added hub tutorial 2013-09-03 10:16:44 +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
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