Commit Graph

4593 Commits

Author SHA1 Message Date
Cheese
c922c3248c disabled trick or treat 2015-11-07 13:36:16 +11:00
Cheese
f4bf685e96 removed halloween hub
removed titan giveaway and pumpkins
2015-11-07 13:20:29 +11:00
Shaun Bennett
4add7449eb Merge remote-tracking branch 'origin/master' 2015-11-06 21:15:45 -05:00
Shaun Bennett
3893617d58 Logitech Giveaway (still needs testing) 2015-11-06 21:15:37 -05:00
Keir
783bec75db Fix for some preferences not applying correctly. 2015-11-06 23:04:51 +00:00
Thanos paravantis
7009e46693 Several updates and bug fixes. Evolution of Combat rework (See ChallengeNewEvolutionOfCombat). 2015-11-06 20:25:38 +02:00
libraryaddict
d3d448ccfe Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-11-07 04:47:37 +13:00
libraryaddict
cc0f12f6c8 Fix player interactions packets not working properly on armorstand and when clicking block behind entity 2015-11-07 04:45:02 +13:00
libraryaddict
77125b3a24 Don't re-set scoreboard lines 2015-11-05 01:10:08 +13:00
libraryaddict
31b4fbec15 Fix a null 2015-11-05 00:49:26 +13:00
libraryaddict
0352e52a68 Tentative beginnings of wider scoreboards 2015-11-05 00:42:45 +13:00
libraryaddict
a0676b7bcf Fix tnt in SG being usable during DM invul 2015-11-04 21:44:10 +13:00
libraryaddict
21d10e4bec Fix typo 2015-11-04 19:15:06 +13:00
libraryaddict
b3f86ba638 Fixing bugs 2015-11-04 18:34:22 +13:00
libraryaddict
c25b1969de More progress 2015-11-04 04:00:53 +13:00
libraryaddict
f66c85d5b0 When clearing or getting items from player inventory, get it from player crafting as well 2015-11-03 18:57:41 +13:00
libraryaddict
93ff7c32b5 Merge pull request #71 in MIN/mineplex from alex-bugfixes to master
* commit 'c518221f6b6d11da83b686445f54d702c35a3d3e':
  - Fix Merge Error
  - Fixed MPS Whitelist
  - Resolved randomly using java 8 in this one plugin
  - Fixed MPS Whitelist for usernames with non-lowercase characters
2015-11-02 23:22:21 -06:00
AlexTheCoder
c518221f6b - Fix Merge Error 2015-11-02 22:14:48 -05:00
AlexTheCoder
c41d01e213 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-bugfixes
Conflicts:
	Plugins/Mineplex.StaffServer/.classpath
2015-11-02 22:09:18 -05:00
AlexTheCoder
89c9f19c69 - Fixed MPS Whitelist 2015-11-02 22:08:02 -05:00
libraryaddict
975ad9e6ea Update to master 2015-11-03 15:05:56 +13:00
libraryaddict
3de906ab19 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
2015-11-03 14:57:25 +13:00
libraryaddict
7496ed763a Fix wither and dead bodies bug 2015-11-03 14:41:34 +13:00
libraryaddict
3f66e11b3d Add fence to non-full-solids 2015-11-03 12:39:13 +13:00
Jonathan Williams
8838ea75e4 Some code cleanup for tasks. 2015-11-02 09:37:11 -06:00
Jonathan Williams
3b38302429 Optimized TaskManager task locks and calls.
Run all player messages on the main thread.
2015-11-02 09:35:35 -06:00
Jonathan Williams
55d028d706 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-01 22:09:58 -06:00
Jonathan Williams
3a0b8d75a2 Added new support member. 2015-11-01 22:09:50 -06:00
Jonathan Williams
18bdcbec62 Fixed some NPEs with TrickDialogue
Added debug messages for Tricks.

Cleanup of monster targets in HubManager.
2015-11-01 22:09:36 -06:00
Shaun Bennett
9cf62cfe7f Don't use player skulls until caching is setup and working properly 2015-11-01 22:58:22 -05:00
Cheese
cdb0fcae75 modified hideme a little :) 2015-11-02 14:37:12 +11:00
Sarah
da6bf27c77 Staff with a higher rank can see lower rank and same ranked vanished staff. 2015-11-02 04:32:07 +01:00
Jonathan Williams
cb96124feb Added extra cleanup for FriendsGUI and AddFriendPage 2015-11-01 17:42:23 -06:00
Jonathan Williams
5c2ade8270 Updated staff list. 2015-10-31 14:55:34 -05:00
Jonathan Williams
f16eee220d Removed Debug messages. 2015-10-31 14:55:18 -05:00
Jonathan Williams
073321fb14 Refactored TrickOrTreat Stuff. 2015-10-31 14:45:42 -05:00
Cheese
92a2c2ebaa fixed npe in kit npc creation 2015-10-31 19:55:58 +11:00
Cheese
b8b260bca1 fixed expire time on projectiles 2015-10-31 19:01:49 +11:00
Cheese
c463b80fe0 fixed insta-expire 2015-10-31 19:00:28 +11:00
Cheese
5d58c56c27 fixed kit bug 2015-10-31 18:31:13 +11:00
Cheese
3636fdfba0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-31 18:23:06 +11:00
Cheese
225f067ab3 fixed some projectile stuff 2015-10-31 18:22:53 +11:00
Shaun Bennett
cd15df0238 Merge remote-tracking branch 'origin/master' 2015-10-31 02:13:24 -04:00
Shaun Bennett
71e49854db Add halloween hats 2015-10-31 02:10:15 -04:00
Shaun Bennett
bce439d0cf Merge pull request #70 in MIN/mineplex from Myst_TRICKORTREAT2 to master
* commit '1a6617bce1af68b0665323d59b956daf290ca91f':
  Changes.
2015-10-31 01:07:55 -05:00
Mysticate
1a6617bce1 Changes. 2015-10-31 02:05:03 -04:00
libraryaddict
519dceb72e Doublejumping downwards is a no no 2015-10-31 19:02:58 +13:00
Cheese
23be8aa1dd removed unncessary stuff
balanced rewards
2015-10-31 14:33:41 +11:00
Cheese
a92a52f009 Merge branch 'Myst_TRICKORTREAT' 2015-10-31 14:27:06 +11:00
Mysticate
4884032a1a Added a beautiful Trick o' Treat system for the hub. Happy Halloween! <3 2015-10-30 23:24:32 -04:00