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
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
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
b3045d38e7
Add colour selection for multiple block types.
2016-02-10 16:34:00 +00:00
b308d1759f
renamed stuff to more sensible stuff. :}
2016-02-10 13:02:55 +00:00
2be917e623
give enemy info about time before siege and after outpost is built, the health of the outpost
2016-02-10 13:01:31 +00:00
69bdbdde70
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-02-10 11:54:36 +00:00
35f0162882
make catapults rideableeeeeee
2016-02-10 11:09:17 +00:00
eebe25040e
cleaned the particle effects a bit
2016-02-10 16:31:25 +11:00
00f7880dd2
Fix compile error
2016-02-09 21:15:15 -06:00
e3ff25526b
Merge pull request #164 in MIN/mineplex from valentines/game to develop
...
* commit '6800e4ef478e2d1eea5c19ec52a8368ec0bd520a':
valentines final push
bug fixes
more valentines :)
many valentine, such wow
val1
2016-02-09 20:28:58 -06:00
f6e091f029
Merge pull request #163 in MIN/mineplex from feature/valentines-cosmetics to develop
...
* commit '57638ff68496b6f10012f8782633066b52a8a715':
More work on valentines
Valentines gifts
Added love potion and hub sheep thing.
Started on Love Potion system. Switching branches.
Varius tweaks and changes.
Added sheep mount to index.
Added various cosmetic items for Valentines day.
2016-02-09 20:28:37 -06:00
57638ff684
More work on valentines
2016-02-09 16:26:17 -06:00
43cf4d38ef
give player arrow back after failed territory siege declaration arrow thingy fire thingy ehh grammar is not needed at night :}
2016-02-09 21:36:58 +00:00
e74cefeee8
increased siege weapon placement area, and made outposts handle siege weapons that are placed within them
2016-02-09 19:59:01 +00:00
e782097563
shouldn't be able to fire weapons whilst in siege wait time
2016-02-09 19:49:25 +00:00
2b44b88ea2
not being able to fire bow without the correct class and changed arrow to actually be an arrow
2016-02-09 19:48:48 +00:00
67d1bffe82
npe and clan minimum players set for siege
2016-02-09 19:47:42 +00:00
9342bee371
das ist gut
2016-02-09 17:05:59 +00:00
6800e4ef47
valentines final push
2016-02-09 20:43:24 +11:00
99ece6eaea
add chest with arrwos to outpost. test for clans in area
2016-02-09 05:53:37 +00:00
a868b8b2b8
Valentines gifts
2016-02-08 22:26:33 -06:00
dd2fe36a3d
added "Borderlands" to Clan name blacklist
2016-02-08 22:23:26 +00:00
052d3c3380
siege system updates
2016-02-08 21:33:12 +00:00
2c13824f9b
possesive method in UtilText
2016-02-08 20:46:45 +00:00
b8471d7a8e
getter for crater size
2016-02-08 20:46:15 +00:00
3ee3059bc7
against clan needs to have a getter
2016-02-08 18:38:30 +00:00
9379c4190a
add against clan to outpsots and also renamed "clan" to "owner" to make it more obvious
2016-02-08 18:31:03 +00:00
51d152d484
Perfect build all fix
2016-02-07 19:05:53 -05:00
aaf1fd42f3
Only eliminated players are guardians. Broken blocks/mobs go directly into inventory.
2016-02-07 18:16:36 -05:00
b40f018ee2
Stop mid game joiners from getting participation gems.
2016-02-07 17:20:58 -05:00
e96b4c4a7f
Mob egg baby fix. Also fixed non build entities from being "broken"
2016-02-07 15:59:59 -05:00
008fc587b0
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-02-07 15:33:37 -05:00
7e9ff95ae3
spec command add guardian
2016-02-07 15:27:39 -05:00
a5c5a7c536
Merge pull request #157 in MIN/mineplex from bugfix/bridges-ore-mining to develop
...
* commit '465f12e210120e316e9252dc4e5b7207b4ae0279':
Fixed NPE
Made sure that a valid tool is used before dropping any items.
2016-02-07 14:00:46 -06:00
c059425e9d
Remove GiveawayManager (not used anymore)
2016-02-07 13:18:29 -06:00
465f12e210
Fixed NPE
2016-02-07 13:27:38 -05:00
f502c2a693
Fix filtermessage sync calls
2016-02-07 12:15:08 -06:00
a8ff714ee4
Added love potion and hub sheep thing.
2016-02-07 10:19:40 -05:00
f7b8dada6d
Add Sentry to BungeeCord too.
2016-02-07 21:40:51 +11:00
2ab1b51401
bug fixes
2016-02-07 14:09:02 +11:00
a35a9ea31f
more valentines :)
2016-02-07 13:27:53 +11:00
c1393697f8
Started on Love Potion system. Switching branches.
2016-02-06 14:08:17 -05:00
4f5625d63e
Clans Alpha 1.0 changes
2016-02-05 18:42:22 -05:00
27e4ef784c
WP Evade
2016-02-06 08:44:37 +11:00
9dc34b5a60
better damage calculation and fixed messages for siege weapon damaging
2016-02-05 19:12:12 +00:00
b0888208d1
More alphs bug fixes
2016-02-05 23:55:38 +11:00
e448046e4f
made inv get cleared on fire
2016-02-05 10:40:53 +00:00
2ac7840d71
The infamous look direction bounce bug
2016-02-04 23:54:54 -05:00
b0b43524da
Chiss' double jump mechanic
2016-02-04 22:05:46 -05:00
b414642990
Varius tweaks and changes.
2016-02-04 21:58:55 -05:00
a76e570b8a
Moar fixes
2016-02-04 21:43:17 -05:00
690c2acce8
many valentine, such wow
2016-02-05 13:25:57 +11:00
bef898afc1
final fixes (? (still broken))
2016-02-05 01:01:10 +00:00
6291decf87
Fixes to flame and broadsword
2016-02-05 11:42:39 +11:00
1b92871b93
remove annoying debug messages
2016-02-04 23:50:44 +00:00
62d45d5419
fix flip starngesness
2016-02-04 23:49:02 +00:00
f5d826a2cb
two parentheses. all it took to fix it. GRRR
2016-02-04 23:42:27 +00:00
8c1ae12d19
beta stuff
2016-02-04 23:29:48 +00:00
73d4ff2639
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
2016-02-05 10:12:31 +11:00
6fd9cffb01
Clans alpha bug fixes
2016-02-05 10:12:18 +11:00
16012285e0
rotation fix
2016-02-04 23:11:51 +00:00
6c7d08a8f9
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-02-04 22:55:53 +00:00
e61b36f55c
Fixed /c stuck timer taking 7 seconds instead of 2 minutes
2016-02-04 22:55:37 +00:00
03da4485b3
pushing to switch to clans/alpha
2016-02-04 22:54:43 +00:00
bc19cf01f7
hopefully that fixes the location offset =/
2016-02-04 22:48:11 +00:00
fa460dbd45
catapult rotatyyyy
2016-02-04 21:50:47 +00:00
e94222a68e
Added sheep mount to index.
2016-02-04 13:13:22 -05:00
c0d6cbbb85
Added various cosmetic items for Valentines day.
...
- Heart arrow trail
- Heart death animation
- Heart double jump animation
- Heart set
- Cupid's bow gadget
- Pink Sheep mount
2016-02-04 13:12:53 -05:00
50c2da2a95
forgot to include this; version getter thingy in Clans
2016-02-04 16:10:14 +00:00
5a8fae4974
stop catapult projectile from getting stuck on bounding box
2016-02-04 16:09:32 +00:00
ecdd21a800
version or plugin command now shows version of clans
2016-02-04 16:09:13 +00:00
b13494f399
more modifications to siege weapons.
2016-02-04 16:00:41 +00:00
5c22c841fe
val1
2016-02-04 10:55:29 +11:00
699a26f630
Merge pull request #159 in MIN/mineplex from master to feature/dmt-update
...
* commit '70d41b074f9256b4ac0b6fb51b68fb24dcf10e24': (328 commits)
Fix treasure stair orientation
add a shard queue to DonationManager, use that for TreasureShardReward
mac fix
Commons codec is not included in BungeeCord.
Pooling with later jedis versions doesn't work on Bungee.
Gitignore redundant Eclipse files.
Add Eclipse magic.
Fixed various ways of players going invisible through Spec mode.
Speed up LobbyBalancer to 500ms
Add example maven settings.xml
Remove setTestOnBorrow
Tone down lobby balancer too.
Emergency patch to slow down redis player count updates.
Fixed explosions dropping right items.
sapling fix
Update fixes - @Teddy!
Made block define its own drops.
Removed an nunnecesarry method
Fixed items not dropping their regular counterpart.
Final changes
...
2016-02-03 16:06:59 -06:00
af5cf309ca
Made sure that a valid tool is used before dropping any items.
2016-02-03 14:43:14 -05:00
c17849b751
fixed some autoboxing stuff
2016-02-03 17:30:07 +00:00
4e2da061bb
added protection around siege weapon
2016-02-03 17:07:06 +00:00
4488b73e93
change catapult bounding box to 3
2016-02-03 17:02:31 +00:00
0cb557d922
moved some stuff around and slight changes
2016-02-03 17:02:06 +00:00
38cae1e3a2
catapult implemented using new siege weapon system, cannons polished up. not tested completely. don't expect this code to work fully haaha
2016-02-03 15:28:53 +00:00
6bba486385
Added message if cannon is not loaded correctly
2016-02-03 11:20:11 +00:00
d4388870c1
fixed inventory opening on mount
2016-02-03 11:19:33 +00:00
8004d0dc3c
fixed npes
2016-02-03 11:06:58 +00:00
95741e3029
fixed siege weapon base
2016-02-03 10:53:53 +00:00
5fd089c768
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
2016-02-03 17:43:43 +11:00
f011fdad5f
Fixes to TntProtection
2016-02-03 15:10:56 +11:00
0e0582a1a7
Added safe zone protection for flame
2016-02-03 10:39:21 +11:00
9086188280
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-02-02 22:02:06 +00:00
6fea76a8e4
finalized alpha patches
2016-02-02 21:38:38 +00:00
23883148dd
alpha fixes
2016-02-02 20:55:23 +00:00
cfbfb1fa3b
raised war points for invasion to 25
2016-02-02 20:42:20 +00:00
9fa5927240
siege weapon base progress
2016-02-02 19:41:25 +00:00
59e564cdc6
Fixes to war point evasion
2016-02-02 23:18:05 +11:00
f1c49fa5ee
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
2016-02-02 22:13:38 +11:00
8a0f585432
Added fix to WarPoint evasion bug + 1 dmg bug
2016-02-02 22:11:52 +11:00
86917fb146
Fix treasure stair orientation
2016-02-02 05:50:03 -05:00
a34ae8cf49
Merge remote-tracking branch 'remotes/origin/master' into develop
2016-02-02 05:37:30 -05:00
0d02f526b6
Merge pull request #116 in MIN/mineplex from bugfix/duplicates to develop
...
* commit 'af27944a39129454b2963707c27799643d2440f1':
add a shard queue to DonationManager, use that for TreasureShardReward
Import clean up
Changed TreasureShard rewarding, removed Queue
Unused import removed
Queue speed up
Debugs removed
Treasure not giving Shards when dupes occur, fixed.
Queue implemented for duplicate shard reward
2016-02-02 04:35:44 -06:00
af27944a39
add a shard queue to DonationManager, use that for TreasureShardReward
2016-02-02 05:34:33 -05:00
610522bdd9
mac fix
2016-02-02 09:25:46 +11:00
ee9e26e8ca
Merge pull request #149 in MIN/mineplex from bugfix/spectator-infest to develop
...
* commit 'ace7d1764c68f6ea679ae60b3104d1af96e1869c':
Fixed various ways of players going invisible through Spec mode.
2016-02-01 16:18:23 -06:00
1a9c36d0a1
Merge pull request #153 in MIN/mineplex from master to bugfix/duplicates
...
* commit '3a945f190dca9f558cbcb6052b3eaa2816d112b3': (308 commits)
Commons codec is not included in BungeeCord.
Pooling with later jedis versions doesn't work on Bungee.
Gitignore redundant Eclipse files.
Add Eclipse magic.
Speed up LobbyBalancer to 500ms
Add example maven settings.xml
Remove setTestOnBorrow
Tone down lobby balancer too.
Emergency patch to slow down redis player count updates.
Fixed explosions dropping right items.
sapling fix
Update fixes - @Teddy!
Made block define its own drops.
Removed an nunnecesarry method
Fixed items not dropping their regular counterpart.
Final changes
Prep for update
Update CB.jar
Prevent hearts changing colors in UHC tab.
Fixed ForTheKing achievement.
...
2016-02-01 15:49:34 -06:00
41ea96d505
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-02-01 16:42:55 -05:00
989c324a37
Hopper item pickup fix.
2016-02-01 16:18:40 -05:00
04ec8a6a26
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
...
Conflicts:
Plugins/pom.xml
2016-02-01 20:10:51 +00:00
84b887fe89
that's not needed
2016-02-01 19:53:59 +00:00
b4ed912f7d
siege weapon modular system beginnings
2016-02-01 19:52:53 +00:00
1e57f19bd6
Commons codec is not included in BungeeCord.
2016-02-01 18:18:23 +11:00
Shaun Bennett
md_5
NewGarbo
libraryaddict
phobia
William Burns
Cheese
Virizion
Mysticate