91ec162c88
slightly easier
2013-10-28 22:30:51 +11:00
3142bd517d
Fixed regen aura... wasnt working at all
2013-10-28 21:35:16 +11:00
9d47864503
Fixed player count in bungee plugin
2013-10-28 03:24:18 -05:00
afee32257d
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-28 02:22:30 -05:00
f0f7a4156f
saving heads to file
2013-10-28 17:53:25 +11:00
4306d2444f
Updated bungee library
...
Fixed server ping Event.java
Removed crash item in hub.
2013-10-28 01:37:23 -05:00
980b6420fe
fixed stacker item for 1.7
2013-10-28 15:48:06 +11:00
09a8cbe558
re-enabled waves
2013-10-28 14:08:55 +11:00
1d4f902298
HH CPU fixes
2013-10-28 13:54:10 +11:00
505dd57715
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-27 15:25:12 +11:00
4974fc17aa
Halloween balance (slightly easier)
...
Giant hitbox improved
2013-10-27 15:24:28 +11:00
845535991d
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-26 16:37:07 -05:00
0aee445e00
Added timeout check for status retrieval
2013-10-26 16:36:48 -05:00
7948fa6f71
cpu fix ;o
2013-10-27 06:21:43 +11:00
3892cd13f7
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-27 05:32:34 +11:00
c9a295d56e
Halloween event changes final
2013-10-27 05:32:21 +11:00
1781ed15c4
Fixed some drop item stuff.
2013-10-26 12:02:18 -05:00
95449fec26
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-26 11:06:19 -05:00
64e98c4a30
text now has glowstone behind it (for darkness)
2013-10-27 03:05:19 +11:00
7d8e79a234
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-26 11:01:22 -05:00
88eab4b1a3
Fixed gadget item slot.
...
Fixed some desc on mounts
2013-10-26 11:01:01 -05:00
d4affc8bb6
paintballs wont change near portals.
2013-10-27 02:53:38 +11:00
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
0b0fa383f6
Finished up Gadget shop.
2013-10-26 10:45:41 -05:00
935599030b
moved witch (so its not default kit)
2013-10-27 02:44:14 +11:00
9a025eb540
Potion rename
2013-10-27 02:37:11 +11:00
55de25fded
removed testing toggle for mount
...
changed item gadget slot from 2 to 3
2013-10-27 02:22:38 +11:00
f838452b5c
uncommented waves
2013-10-27 01:46:46 +11:00
19e2946ce4
mule rename
2013-10-27 01:44:18 +11:00
b4e2145ad7
giant speed decrease
...
ghast teleports back if it flies too far away.
2013-10-27 01:43:41 +11:00
cd2c9dcdda
more tips
2013-10-27 01:20:10 +11:00
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
39cf5c3ed1
Tweaking on ghast.
...
Added gadget costs
Working on Gadget shop.
2013-10-26 08:50:12 -05:00
c672e68713
some help during boss fight.
2013-10-27 00:14:38 +11:00
7eb1cc6519
Halloween game additions
2013-10-27 00:06:44 +11:00
01cb69d28b
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-26 19:01:41 +11:00
723b57cd46
Added paintball gun Gadget
...
Added bat blaster Gadget
Halloween Game near-completed
Added SSM Witch
2013-10-26 19:01:26 +11:00
ca3979f4fa
Added witch disguise hurt sound
2013-10-25 20:12:01 -05:00
8958b8998f
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-26 11:35:02 +11:00
a52bd69558
Witch SSM
2013-10-26 11:34:05 +11:00
5470f847a9
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-25 19:06:43 -05:00
8883855297
Added witch disguise
...
Added missing files.
2013-10-25 19:05:26 -05:00
49e8c15f44
important update
2013-10-25 22:56:28 +11:00
e8ddfc266e
fsd6gty72 tjn6g wgh
2013-10-25 22:20:46 +11:00
61b7a86b67
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-25 21:25:36 +11:00
b74b8e3915
Halloween event changes
2013-10-25 21:25:23 +11:00
e5f99331dd
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-25 05:16:15 -05:00
c3754d766b
Added in vegetate check for EntityGhast.
2013-10-25 05:15:17 -05:00
5563d94111
Halloween event update
...
hub News
hub mounts
hub gadgets
2013-10-25 19:20:14 +11:00
21128eb153
Prepping filterChat and CoreClientManager for mysql
...
Removed get all clients at server start.
2013-10-23 16:36:13 -05:00
1977572ced
Added Halloween Minigame
...
Updated gadgets and other minor things.
2013-10-22 15:46:31 +11:00
7cec55713c
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-19 16:52:27 +11:00
1944c0003c
Hub gadgets
2013-10-19 16:52:15 +11:00
985ce795d2
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-18 00:50:49 -07:00
90fbc397ff
Converted gem rewards to boolean return from website.
...
Implemented gem transactions and source.
2013-10-18 00:46:06 -07:00
02258b9fd3
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-18 09:12:19 +11:00
882ede9a21
tp ah exception
2013-10-18 09:09:29 +11:00
7e77f78d2f
Removed all client list pull.
2013-10-17 00:54:14 -07:00
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
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
410e08b06a
Clearer MAC reporting to staff
2013-10-17 09:05:03 +11:00
4d6a0e2133
Ah no kick
2013-10-17 09:02:52 +11:00
d9ecbf4037
AH Update
2013-10-17 09:01:36 +11:00
d23f72567a
fixed bug.
2013-10-16 17:22:28 +11:00
9cdcbed086
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-16 12:24:02 +11:00
2a836f3464
Added anti-hack
2013-10-16 12:23:23 +11:00
483f8ffde3
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-15 14:20:45 -07:00
9569c3906e
Starting work on dynamic server.
2013-10-15 14:19:14 -07:00
1a5f6a9b74
Coreclient fix.
2013-10-15 14:18:13 -07:00
40e49dd3d4
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-16 08:11:04 +11:00
ec80d8a568
added AntiHack
...
added dragonrider coolness
2013-10-16 08:10:45 +11:00
c68bfce21a
Fix for null pointer in core client cleanup
2013-10-14 12:20:49 -07:00
922d269a52
Added core client cleanup in case of weird glitch from bungee
2013-10-13 22:40:06 -07:00
1cdb89f4bf
Derp, missing arcade.
2013-10-13 21:51:38 -07:00
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
230ad4aa7b
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-14 10:29:48 +11:00
9ffc793f61
added Dragon Rider
...
anti-stack changes (dont anti-stack mined blocks)
2013-10-14 10:29:20 +11:00
6dee9c983f
Increased interval between sending restart commands from server monitor.
2013-10-13 02:25:17 -07:00
1c1fb056a6
Memory leak fix for explosion blocks.
2013-10-13 01:27:41 -07:00
25dec6fb46
Fixed player arm animation bug.
...
Added EnderDragon AI control and vegetation
2013-10-12 20:31:43 -07:00
36b825d36d
Snake update (woo)
2013-10-13 10:33:16 +11:00
d784a0b017
snake speed ramp up decrease
2013-10-13 09:38:03 +11:00
a34b6da238
even less blocks
2013-10-13 09:20:00 +11:00
bb39f18573
Explosion creates less blocks.
2013-10-13 09:18:49 +11:00
e12477c4b6
snake max speed decrease
2013-10-13 08:46:02 +11:00
1fd894934a
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-13 08:43:06 +11:00
377f4b0680
Gem fix, now correctly displays scaled gems.
...
UHC public changes
Snake fixes.
2013-10-13 08:42:49 +11:00
c5385ee7dc
Fixed ultra join in arcade manager.
2013-10-12 02:53:22 -07:00
e723075298
Increased lobby menu size.
...
Fixed memory leak in Explosion
2013-10-12 02:52:35 -07:00
03c74aa419
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
2013-10-12 01:55:52 -07:00
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
c8386bbc40
blue kit for snake
2013-10-12 18:22:20 +11:00
a315064a3f
snake fix
...
parkour radius increase
2013-10-12 18:21:19 +11:00
0564bd740a
SSM wolf balance
2013-10-12 17:17:24 +11:00
4eecca3063
Wolf fixes
2013-10-12 17:13:28 +11:00
8766767d96
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-12 16:59:38 +11:00
27fb3b4262
Snake changes
...
SSM Wolf fixes
2013-10-12 16:59:23 +11:00
f2c295c391
Fixed global ultra joining full games.
2013-10-11 22:03:17 -07:00
0b2dcc2617
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
2013-10-12 09:34:59 +11:00
8376316994
Added Paintball
...
Added SSM Kit: Wolf
UPDATES.
2013-10-12 09:34:46 +11:00
923a066013
Added ServerMonitor
2013-10-10 09:02:21 -07:00
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
ed804e3336
Dragon escape update
2013-10-09 21:50:39 +11:00
ca4760a7d6
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-10-08 02:22:29 -07:00
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
1fc446ae13
Lobby text now displays map
2013-10-08 17:56:57 +11:00
b64803e499
Smash Wolf
2013-10-08 17:44:04 +11:00
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
c9af91fcd6
Tweak on lobby to show number instead of player count in item.
2013-10-05 01:49:55 -07:00
1431961b39
Fixed issues with Pet menu.
...
Fixed typo in Welcome Tutorial
2013-10-05 00:59:45 -07:00
f389378bd2
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-10-04 23:57:58 -07:00
4ed1d97a33
Added missing pet buttons.
2013-10-04 23:56:16 -07:00
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
ab45c717dd
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-10-05 07:49:21 +10:00
3ba848567c
paintball added
...
hg additions
minor changes to other games
2013-10-05 07:49:05 +10:00
57b0d06786
Added DisguiseWolf
...
Added lobby menu (disabled autogive for testing)
Removed unused commands.
2013-10-02 22:23:01 -07:00
44da981cf4
Fixed dominate bug again.
...
Fixed quick game menu bug.
2013-09-27 23:06:53 -07:00
86199d2795
Fix for dominate.
2013-09-27 20:05:30 -07:00
f9400a0eb4
Fixed multiple finishes for parkours
2013-09-27 12:45:24 -07:00
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
894a121a2e
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-27 17:08:52 +10:00
34521eef8f
minor game fixes
...
portal method in StackerManager.java
2013-09-27 17:08:32 +10:00
7c0e3bcc53
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-26 21:20:38 -07:00
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
2a3d7426d5
Some scoreboard fixes
2013-09-26 12:38:32 +10:00
f0e6a7294e
squid hitbox larger
2013-09-24 09:18:36 +10:00
0390d4f63b
desc update suqid
2013-09-24 08:56:51 +10:00
064dd97d00
HitBox support for disguises
...
Squid hitbox added
Changed squid swimming!
2013-09-24 08:56:09 +10:00
ea5cc7161a
pigssss
2013-09-24 08:19:07 +10:00
d8d4b69dda
baby pig to pig
2013-09-24 08:15:48 +10:00
82f5fcb963
Pig Fix!
2013-09-24 08:12:51 +10:00
68e068092f
Fix for ageable.
2013-09-23 15:09:52 -07:00
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
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
d4775a91a1
hitbox reduction
2013-09-23 17:45:14 +10:00
0f9f28dcc2
fixed weapon names in pigs, + baby pig on platform
2013-09-23 17:36:53 +10:00
5ba494c381
Made player names more visible in squid
2013-09-23 16:05:05 +10:00
ce89108aea
Fixed disguises in bacon brawl
2013-09-23 16:00:35 +10:00
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
bf4dc35b5f
Added pig Game
...
added squid game
added recharged skill event
2013-09-23 15:48:35 +10:00
8aad215475
Added sheep color/shear for disguise
2013-09-22 21:12:08 -07:00
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
cc63fdccfc
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master
2013-09-21 15:02:14 -07:00
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
b3a78112be
Fixed gem display bug
2013-09-21 13:53:12 +10:00
eb6bbceecd
Slowed hunger degen a little, increased regen to damage dealt.
2013-09-21 13:40:04 +10:00
9064272a38
Prepared SSM for 200 player Game (added hunger)
2013-09-21 13:34:14 +10:00
9da18ea43f
Merge branch 'master' of ssh://198.245.50.91:7999/min/master
2013-09-21 08:34:24 +10:00
a92c74a28a
HG Updates
...
Other minor fixes
2013-09-21 08:34:07 +10:00
85cc6e5b2b
Updated to 1.6.4
2013-09-20 01:50:56 -07:00
Chiss
Jonathan Williams