Commit Graph

4219 Commits

Author SHA1 Message Date
Sarah 96dc86a481 Fixing map rotation. 2015-08-15 07:34:04 +02:00
Mysticate 2659dd4e39 Fixed minor bugs. Head now follows mob altitude. 2015-08-14 23:17:56 -04:00
Shaun Bennett fda052ea90 Add treasure chest stats 2015-08-14 21:34:37 -05:00
Shaun Bennett e89961380b Merge remote-tracking branch 'origin/master' 2015-08-14 21:14:41 -05:00
Shaun Bennett 1eaa6446af Fix double hologram and hopefully NPE 2015-08-14 21:14:34 -05:00
Shaun Bennett c520bd7921 Add recharge to carl spins so that they don't get triggered twice 2015-08-14 20:43:58 -05:00
Mysticate ac18dd3b79 Fixed iron golem select message. Removed slot change message. 2015-08-14 20:22:00 -04:00
libraryaddict 7fb85f24d1 UtilEnt: Change CreatureLook to support LivingEntity, not just Creature 2015-08-14 19:15:35 +12:00
libraryaddict 33a6e4cb13 UtilEnt: Add CreatureLook method 2015-08-14 19:12:05 +12:00
Jonathan Williams a2d7aa77fe Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-14 00:37:55 -05:00
Jonathan Williams f5d934fe53 Fixed sync db calls for pets.
Make sure to add/remove pets in mysql.
2015-08-14 00:37:43 -05:00
Mini-Chiss 80588a308b balanaced brawler 2015-08-13 21:03:48 +02:00
Mini-Chiss 7157aaee2b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-13 20:56:20 +02:00
Mini-Chiss a1ba2cffac fixed needler not doing posion 2015-08-13 20:56:02 +02:00
Shaun Bennett 0b4dbab871 Change ticket command access to admin 2015-08-13 11:23:29 -05:00
Shaun Bennett bd7317cf7b Fix ticket command rollback >:D 2015-08-13 11:03:12 -05:00
Mysticate eaad787075 Removed the base kit and replaced it with Iron Golem. 2015-08-13 08:16:33 -04:00
Mini-Chiss 5fa9135b08 renamed soccer to slimeball :) 2015-08-13 14:11:22 +02:00
Mini-Chiss 6ef3215516 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-13 13:25:41 +02:00
Mini-Chiss 534c91c706 remove items from inside soccer 2015-08-13 13:24:55 +02:00
Shaun Bennett bc8aff31cb Merge remote-tracking branch 'origin/master' 2015-08-13 06:12:24 -05:00
Shaun Bennett af15476f19 Use login query to handle logins 2015-08-13 06:12:11 -05:00
Mini-Chiss 878ac82ade fixed error! 2015-08-13 13:01:41 +02:00
Mini-Chiss 1487692609 completely disabled team armor in arcade. avoids typing it just as game starts. 2015-08-13 12:57:30 +02:00
Mini-Chiss fc1a8e4e25 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-13 12:52:11 +02:00
Mini-Chiss f3b58fe9b6 disabled team armor command in games D: 2015-08-13 12:51:57 +02:00
Shaun Bennett e1d04354fb Use dummy record for AddPlayer 2015-08-13 05:18:53 -05:00
Shaun Bennett 94c00cdb72 Adding some comments 2015-08-13 04:05:28 -05:00
Shaun Bennett 4d6e827739 Remove vote3! 2015-08-13 04:03:03 -05:00
Shaun Bennett 92c0e1452b Add vote3 2015-08-13 04:01:53 -05:00
Shaun Bennett 0c68321e81 Global button 2015-08-13 03:58:05 -05:00
Shaun Bennett 11a4805c38 Stat stuff! 2015-08-13 03:54:23 -05:00
Shaun Bennett 4aac057956 Merge remote-tracking branch 'origin/master' 2015-08-13 03:32:40 -05:00
Shaun Bennett 05b1b91686 Carl! 2015-08-13 03:32:31 -05:00
Jonathan Williams 8476578bc0 Merge pull request #28 in MIN/mineplex from Myst_LOBBERS to master
* commit 'f8a6a25b46b9336ae8a727e1f3478f3a7a394324':
  Various Fixes.
2015-08-13 01:52:16 -05:00
Jonathan Williams a308244966 Merge pull request #29 in MIN/mineplex from foo to master
* commit '07bdbdde46e2a9e7b49f4e8606c9068a0534c18d': (22 commits)
  minor grammar issue
  remove duplicate method
  manually updating something
  *crosses fingers* please work!
  please work...
  Freezes the time using doDayLightCycle instead of using a UpdateEvent.
  Fixed double-half-slabs (line 68)
  remove custom level to fix merge conflicts
  squirrel!
  fix getting snowballs from bedrock
  add jnr_dev to updaterank
  fix this agaaaaain
  FOOIFY IS A NOOB OKAY
  fix concurrentmodificationexception
  fix turfforts bug
  prevent STATIONARY_LAVA from breaking in creeper smash
  fix creeper smash exploding lava and bedrock
  fix spleef lava issue
  ishh also wanted this :P (let me know if I should remove it)
  ishh wanted it...k
  ...
2015-08-13 01:49:00 -05:00
Jonathan Williams 0ff7cee229 Merge pull request #32 in MIN/mineplex from Alex_MILKCOW to master
* commit 'cc24bb78d3968c0c364164fb43e19724007e3833':
  Fixed Cows being able to fly if they had the Rabbit Farmer kit
  Fixed new classes not appearing in repository
  Milk The Cow: New Gameplay Feature - When a cow charges a farmer, any milk in their bucket will be lost
2015-08-13 01:45:56 -05:00
Mysticate ed7dbddf4a Redid how kits are done. 2015-08-13 00:12:28 -04:00
Mysticate d7e28e9eb8 You can no longer have the option to Evolve if you kill while dead. 2015-08-12 13:28:31 -04:00
Mini-Chiss 4f163af909 fixed a uid problem with maps 2015-08-12 18:36:29 +02:00
Mysticate a7da10cb34 You no longer remain "charging" when you die. 2015-08-12 12:12:26 -04:00
Mysticate ad94b63903 Blaze and Enderman now take water damage. 2015-08-12 10:46:12 -04:00
Mysticate 0c3c9702d9 Small fixes.
Added holograms to show kit abilities.
Fireworks are now client side only.
Decreased the # of emerald particles.
2015-08-12 09:44:55 -04:00
Mini-Chiss fcfb2559b8 players cannot grab slime :O 2015-08-12 14:41:33 +02:00
Mini-Chiss d1302e8dc3 fixed full msg 2015-08-12 12:42:59 +02:00
Mini-Chiss 5293e24469 fixed text 2015-08-12 11:58:40 +02:00
Mini-Chiss cd5c7e7110 fixed kb 2015-08-12 11:23:19 +02:00
Shaun Bennett 37e5e97020 Fix experience reward displaying as game 2015-08-12 03:08:40 -05:00
Shaun Bennett f81f5d82d6 Merge remote-tracking branch 'origin/master' 2015-08-12 03:00:16 -05:00
Shaun Bennett 30f20801c7 Lets hope everything works! 2015-08-12 03:00:07 -05:00