Commit Graph

6774 Commits

Author SHA1 Message Date
md_5 628e77a701 Don't process empty chat messages. 2016-02-17 18:32:43 +11:00
md_5 e6c00b06ee Fix exception in GameChatManager if an Arcade game has not been initialized. 2016-02-17 18:29:47 +11:00
md_5 e3861d3bc0 Fix NPE in TnTGenerator 2016-02-17 18:22:37 +11:00
Shaun Bennett c20e32d2c0 Merge remote-tracking branch 'origin/develop' into develop 2016-02-16 16:55:11 -06:00
Shaun Bennett 684a40db41 Fix giving TITAN in Staff Server 2016-02-16 16:55:00 -06:00
Shaun Bennett 1c5ae77329 Fix Valentines quick server menu button 2016-02-16 16:54:05 -06:00
md_5 8893db60d7 Fix highly annoying exception in Reindeer mount. 2016-02-16 12:46:39 +11:00
Shaun Bennett 37757ad7de Add TypeWars to MPS 2016-02-15 18:55:13 -06:00
Shaun Bennett 904798ec22 Delete libraries directory/old craftbukkit jar (now in Patches folder) 2016-02-15 18:10:44 -06:00
md_5 6d7dbf6c67 Fix Sentry when running from shaded jar. 2016-02-16 10:51:16 +11:00
Shaun Bennett 95c22a59fd Use DNS for chat filter 2016-02-15 16:30:57 -06:00
Shaun Bennett d1e098ca13 Merge remote-tracking branch 'origin/develop' into develop 2016-02-15 20:44:52 -06:00
Shaun Bennett 15ed2570e2 Valentines final changes, Change Gift Giver achievement 2016-02-15 20:43:46 -06:00
NewGarbo a5de88e6ee accidentally added those ifles 2016-02-15 11:25:33 +00:00
NewGarbo e25accfba4 outpost saving and loadi9ng 2016-02-15 11:24:29 +00:00
md_5 7b36892328 Store craftbukkit jar in repo for ease of use. 2016-02-15 10:06:47 +11:00
md_5 bc3002134f Update + Rebuild Patches. 2016-02-15 10:01:14 +11:00
md_5 305973198c Merge remote-tracking branch 'origin/md_5/sentry' into develop 2016-02-15 09:20:34 +11:00
phobia d7ad2cdc58 moar undead fixes 2016-02-14 12:37:37 +11:00
NewGarbo 93a5ca6777 weapons need to be centered 2016-02-14 00:45:54 +00:00
phobia 24254635a8 Fixes to observer settings 2016-02-14 09:51:59 +11:00
NewGarbo 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
Shaun Bennett 0d19a8017f Update Featured arcade game, various bug fixes 2016-02-12 06:51:30 -06:00
Shaun Bennett e8559d423a Add Valentines Vendetta to quick server menu 2016-02-12 05:27:50 -06:00
Shaun Bennett 960a0cdabb Fix constructor error, add ValentinesGiftManager to Arcade 2016-02-12 05:06:13 -06:00
Shaun Bennett eca400278c Support server update 2016-02-12 05:00:09 -06:00
Shaun Bennett 1e596a6969 Valentines rewards 2016-02-12 04:54:09 -06:00
Shaun Bennett 66aa89b5e0 Fix sheep look bug, valentines gift effects, valentines achievements 2016-02-12 04:32:26 -06:00
Shaun Bennett dfd61833b7 Valentines changes 2016-02-12 03:03:47 -06:00
Shaun Bennett 4f0f81c8df Update Courtship messages 2016-02-12 01:47:20 -06:00
Shaun Bennett d51e26a5a4 Valentines game adjustments 2016-02-12 01:34:29 -06:00
NewGarbo 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
Shaun Bennett d8965179f7 More valentines adjustments/fix gladiators tutorial being enabled 2016-02-11 23:01:59 -06:00
Shaun Bennett 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
William Burns 790ed4f993 Fix tools for block type/colour selections. 2016-02-11 08:11:40 +00:00
NewGarbo 67b12f3ae2 loads of progress 2016-02-10 19:24:57 +00:00
William Burns b3045d38e7 Add colour selection for multiple block types. 2016-02-10 16:34:00 +00:00
NewGarbo b308d1759f renamed stuff to more sensible stuff. :} 2016-02-10 13:02:55 +00:00
NewGarbo 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
NewGarbo 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
NewGarbo 35f0162882 make catapults rideableeeeeee 2016-02-10 11:09:17 +00:00
Cheese eebe25040e cleaned the particle effects a bit 2016-02-10 16:31:25 +11:00
Shaun Bennett 00f7880dd2 Fix compile error 2016-02-09 21:15:15 -06:00
Shaun Bennett 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
Shaun Bennett 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
Shaun Bennett 57638ff684 More work on valentines 2016-02-09 16:26:17 -06:00
NewGarbo 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
NewGarbo 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
NewGarbo e782097563 shouldn't be able to fire weapons whilst in siege wait time 2016-02-09 19:49:25 +00:00
NewGarbo 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