Commit Graph

4247 Commits

Author SHA1 Message Date
Sarah 6e926b431c Fixing snowballs and eggs in Solo Skywars. 2015-08-19 16:00:36 +02:00
Jonathan Williams bbe5b79c7e Disabled AntiHack create table.
Fixed NPE with ServerManager
2015-08-19 04:11:34 -05:00
Jonathan Williams 6aca4e161d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-19 04:11:08 -05:00
Mini-Chiss 3d7c81a3b4 fixed game tips 2015-08-19 08:15:22 +02:00
Mysticate 64990ed356 Fixed parse distance. 2015-08-18 21:37:52 -04:00
Mysticate 53395a7700 Made player immovable whilst evolving. 2015-08-18 13:07:46 -04:00
Jonathan Williams fb8519a099 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-18 02:53:56 -05:00
Mini-Chiss 14bf8faf3a disabled big sale 2015-08-18 09:49:53 +02:00
Mysticate 75a4b3d568 Changes to make evolving easier
• Speed 1 on kill
• Evolve chargeup decreases 1.5 seconds per kill.
2015-08-17 10:36:28 -04:00
Mini-Chiss b7854e6cab added big larry to chests 2015-08-17 13:05:41 +02:00
Mini-Chiss 9eed03237b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-17 12:39:06 +02:00
Mini-Chiss 58e517a4d7 fixed null args more 2015-08-17 12:38:41 +02:00
Shaun Bennett 8ab8388344 Merge remote-tracking branch 'origin/master' 2015-08-17 05:05:36 -05:00
Shaun Bennett 5c71522b2d Return the first UUID instead of last (AccountRepository) 2015-08-17 05:05:25 -05:00
Mini-Chiss 0a23f91592 fixed two little bogs 2015-08-17 11:53:50 +02:00
Shaun Bennett dc8bec340e Rename Quick game menu for consistency 2015-08-17 03:18:35 -05:00
Mini-Chiss 7a7543886f fixed a ton of commands NPEing on no args 2015-08-17 09:04:39 +02:00
Mysticate 993ed0a92d Fixed a possible NPE 2015-08-16 22:38:59 -04:00
Jonathan Williams 81e605930f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-08-16 04:16:31 -05:00
Jonathan Williams 78227c1658 Removed unnecessary code in website.
Added ability to retrieve bulkpets for converting.
2015-08-16 04:16:19 -05:00
Mini-Chiss 8cc5ff042c fixed block hunt gem exploits 2015-08-16 09:33:15 +02:00
Mini-Chiss 91ce9cfba7 fixed a crash with fireworks 2015-08-16 08:39:03 +02:00
Mini-Chiss 8584e0355a final fix! 2015-08-15 12:32:03 +02:00
Mini-Chiss ba6806935d fixed better 2015-08-15 12:31:19 +02:00
Mini-Chiss 6ac586790d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-08-15 12:27:30 +02:00
Mini-Chiss 25f93bac2e fixed logic on setgame 2015-08-15 12:27:11 +02:00
Shaun Bennett 555908a3c1 Rename preferences gui, add shop items for gold and emeralds (commented out right now), fix typo 2015-08-15 02:03:46 -05:00
Sarah 27da9b64b6 Merge branch 'KitPreferences' of http://184.154.0.242:7990/scm/min/mineplex into SarahsAwesomeBugFixes 2015-08-15 07:40:40 +02:00
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