c811906a7e
REVERT: Provide option to load config from mineplex.yml, not per game folders. (reverted from commit b58ea5b51a)
2016-02-19 18:21:01 +11:00
d5583b93f2
remove eclipse files
2016-02-19 07:14:13 +00:00
7714e4960c
Use DBPool for everything
2016-02-19 00:17:38 -06:00
eab992e621
Delete SimpleStats
2016-02-18 23:01:23 -06:00
6d81e43b30
Don't print db config to System.out
2016-02-19 15:30:30 +11:00
b58ea5b51a
Provide option to load config from mineplex.yml, not per game folders.
2016-02-19 15:25:09 +11:00
dc5fe21f3d
more npe checking
2016-02-18 21:53:55 +00:00
24b834370b
null pointers with siege weaponl oading
2016-02-18 21:37:13 +00:00
8507bb1bd8
all progress over this week
2016-02-18 21:29:42 +00:00
8b1b63c8b3
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9
...
Conflicts:
Patches/craftbukkit.jar
2016-02-18 16:45:37 +13:00
1a1c64dc51
Fix PerkMadScientist on non game zombies.
2016-02-17 18:44:49 +11:00
b5f4055269
Fix command stack trace on unitialized arcade games.
2016-02-17 18:40:24 +11:00
3fad9c639a
Fix stack trace in master builders when clicking on a watch.
2016-02-17 18:39:26 +11:00
50f58ba3a5
Don't stack entities when a game isn't running.
2016-02-17 18:33:40 +11:00
628e77a701
Don't process empty chat messages.
2016-02-17 18:32:43 +11:00
e6c00b06ee
Fix exception in GameChatManager if an Arcade game has not been initialized.
2016-02-17 18:29:47 +11:00
e3861d3bc0
Fix NPE in TnTGenerator
2016-02-17 18:22:37 +11:00
c20e32d2c0
Merge remote-tracking branch 'origin/develop' into develop
2016-02-16 16:55:11 -06:00
684a40db41
Fix giving TITAN in Staff Server
2016-02-16 16:55:00 -06:00
1c5ae77329
Fix Valentines quick server menu button
2016-02-16 16:54:05 -06:00
8893db60d7
Fix highly annoying exception in Reindeer mount.
2016-02-16 12:46:39 +11:00
37757ad7de
Add TypeWars to MPS
2016-02-15 18:55:13 -06:00
904798ec22
Delete libraries directory/old craftbukkit jar (now in Patches folder)
2016-02-15 18:10:44 -06:00
6d7dbf6c67
Fix Sentry when running from shaded jar.
2016-02-16 10:51:16 +11:00
95c22a59fd
Use DNS for chat filter
2016-02-15 16:30:57 -06:00
d1e098ca13
Merge remote-tracking branch 'origin/develop' into develop
2016-02-15 20:44:52 -06:00
15ed2570e2
Valentines final changes, Change Gift Giver achievement
2016-02-15 20:43:46 -06:00
a5de88e6ee
accidentally added those ifles
2016-02-15 11:25:33 +00:00
e25accfba4
outpost saving and loadi9ng
2016-02-15 11:24:29 +00:00
7b36892328
Store craftbukkit jar in repo for ease of use.
2016-02-15 10:06:47 +11:00
bc3002134f
Update + Rebuild Patches.
2016-02-15 10:01:14 +11:00
305973198c
Merge remote-tracking branch 'origin/md_5/sentry' into develop
2016-02-15 09:20:34 +11:00
d7ad2cdc58
moar undead fixes
2016-02-14 12:37:37 +11:00
93a5ca6777
weapons need to be centered
2016-02-14 00:45:54 +00:00
24254635a8
Fixes to observer settings
2016-02-14 09:51:59 +11:00
e6eb43ada8
PUSHING CODE BECAUSE MY HDD MIGHT BE BREAKING DOWN. THIS CODE IS UNTESTED PROBABLY DOESN'T WORK
2016-02-12 19:58:40 +00:00
0d19a8017f
Update Featured arcade game, various bug fixes
2016-02-12 06:51:30 -06:00
e8559d423a
Add Valentines Vendetta to quick server menu
2016-02-12 05:27:50 -06:00
960a0cdabb
Fix constructor error, add ValentinesGiftManager to Arcade
2016-02-12 05:06:13 -06:00
eca400278c
Support server update
2016-02-12 05:00:09 -06:00
1e596a6969
Valentines rewards
2016-02-12 04:54:09 -06:00
66aa89b5e0
Fix sheep look bug, valentines gift effects, valentines achievements
2016-02-12 04:32:26 -06:00
dfd61833b7
Valentines changes
2016-02-12 03:03:47 -06:00
4f0f81c8df
Update Courtship messages
2016-02-12 01:47:20 -06:00
d51e26a5a4
Valentines game adjustments
2016-02-12 01:34:29 -06:00
90570c1185
progress on saving outposts/wepaons so far. not finished. probably going to change it to a different format
2016-02-12 07:00:21 +00:00
d8965179f7
More valentines adjustments/fix gladiators tutorial being enabled
2016-02-11 23:01:59 -06:00
2eeddb828b
Merge pull request #165 in MIN/mineplex from virizion_speed_builder to develop
...
* commit '51d152d48473f820ab6d03586fb41f890750f645':
Perfect build all fix
Only eliminated players are guardians. Broken blocks/mobs go directly into inventory.
Stop mid game joiners from getting participation gems.
Mob egg baby fix. Also fixed non build entities from being "broken"
spec command add guardian
The infamous look direction bounce bug
Chiss' double jump mechanic
Moar fixes
Hopper item pickup fix.
2016-02-11 22:59:35 -06:00
790ed4f993
Fix tools for block type/colour selections.
2016-02-11 08:11:40 +00:00
67b12f3ae2
loads of progress
2016-02-10 19:24:57 +00:00
md_5
NewGarbo
Shaun Bennett
libraryaddict
phobia
William Burns