Commit Graph

6971 Commits

Author SHA1 Message Date
NewGarbo 99ece6eaea add chest with arrwos to outpost. test for clans in area 2016-02-09 05:53:37 +00:00
Shaun Bennett a868b8b2b8 Valentines gifts 2016-02-08 22:26:33 -06:00
NewGarbo dd2fe36a3d added "Borderlands" to Clan name blacklist 2016-02-08 22:23:26 +00:00
NewGarbo 052d3c3380 siege system updates 2016-02-08 21:33:12 +00:00
NewGarbo 2c13824f9b possesive method in UtilText 2016-02-08 20:46:45 +00:00
NewGarbo b8471d7a8e getter for crater size 2016-02-08 20:46:15 +00:00
NewGarbo 3ee3059bc7 against clan needs to have a getter 2016-02-08 18:38:30 +00:00
NewGarbo 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
Virizion 51d152d484 Perfect build all fix 2016-02-07 19:05:53 -05:00
Virizion aaf1fd42f3 Only eliminated players are guardians. Broken blocks/mobs go directly into inventory. 2016-02-07 18:16:36 -05:00
Virizion b40f018ee2 Stop mid game joiners from getting participation gems. 2016-02-07 17:20:58 -05:00
Virizion e96b4c4a7f Mob egg baby fix. Also fixed non build entities from being "broken" 2016-02-07 15:59:59 -05:00
Virizion 008fc587b0 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2016-02-07 15:33:37 -05:00
Virizion 7e9ff95ae3 spec command add guardian 2016-02-07 15:27:39 -05:00
Shaun Bennett 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
Shaun Bennett c059425e9d Remove GiveawayManager (not used anymore) 2016-02-07 13:18:29 -06:00
Mysticate 465f12e210 Fixed NPE 2016-02-07 13:27:38 -05:00
Shaun Bennett f502c2a693 Fix filtermessage sync calls 2016-02-07 12:15:08 -06:00
Mysticate a8ff714ee4 Added love potion and hub sheep thing. 2016-02-07 10:19:40 -05:00
md_5 9ea32d0725 Use ERROR for Spigot to ensure we don't blow past our plan limits. 2016-02-07 22:02:48 +11:00
md_5 f7b8dada6d Add Sentry to BungeeCord too. 2016-02-07 21:40:51 +11:00
md_5 2eb365c189 Implement Sentry for exception monitoring. 2016-02-07 20:29:56 +11:00
Cheese 2ab1b51401 bug fixes 2016-02-07 14:09:02 +11:00
Cheese a35a9ea31f more valentines :) 2016-02-07 13:27:53 +11:00
Mysticate c1393697f8 Started on Love Potion system. Switching branches. 2016-02-06 14:08:17 -05:00
Shaun Bennett 4f5625d63e Clans Alpha 1.0 changes 2016-02-05 18:42:22 -05:00
phobia 27e4ef784c WP Evade 2016-02-06 08:44:37 +11:00
NewGarbo 9dc34b5a60 better damage calculation and fixed messages for siege weapon damaging 2016-02-05 19:12:12 +00:00
phobia b0888208d1 More alphs bug fixes 2016-02-05 23:55:38 +11:00
NewGarbo e448046e4f made inv get cleared on fire 2016-02-05 10:40:53 +00:00
Virizion 2ac7840d71 The infamous look direction bounce bug 2016-02-04 23:54:54 -05:00
Virizion b0b43524da Chiss' double jump mechanic 2016-02-04 22:05:46 -05:00
Mysticate b414642990 Varius tweaks and changes. 2016-02-04 21:58:55 -05:00
Virizion a76e570b8a Moar fixes 2016-02-04 21:43:17 -05:00
Cheese 690c2acce8 many valentine, such wow 2016-02-05 13:25:57 +11:00
NewGarbo bef898afc1 final fixes (? (still broken)) 2016-02-05 01:01:10 +00:00
phobia 6291decf87 Fixes to flame and broadsword 2016-02-05 11:42:39 +11:00
NewGarbo 1b92871b93 remove annoying debug messages 2016-02-04 23:50:44 +00:00
NewGarbo 62d45d5419 fix flip starngesness 2016-02-04 23:49:02 +00:00
NewGarbo f5d826a2cb two parentheses. all it took to fix it. GRRR 2016-02-04 23:42:27 +00:00
NewGarbo 8c1ae12d19 beta stuff 2016-02-04 23:29:48 +00:00
phobia 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
phobia 6fd9cffb01 Clans alpha bug fixes 2016-02-05 10:12:18 +11:00
NewGarbo 16012285e0 rotation fix 2016-02-04 23:11:51 +00:00
NewGarbo 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
NewGarbo e61b36f55c Fixed /c stuck timer taking 7 seconds instead of 2 minutes 2016-02-04 22:55:37 +00:00
NewGarbo 03da4485b3 pushing to switch to clans/alpha 2016-02-04 22:54:43 +00:00
NewGarbo bc19cf01f7 hopefully that fixes the location offset =/ 2016-02-04 22:48:11 +00:00
NewGarbo fa460dbd45 catapult rotatyyyy 2016-02-04 21:50:47 +00:00
Mysticate e94222a68e Added sheep mount to index. 2016-02-04 13:13:22 -05:00