JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,644 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

4644 Commits

Author SHA1 Message Date
Jonathan Williams ff936784d3 Remove debug code. 2015-11-08 17:27:00 -06:00
Jonathan Williams e86623c8d0 Disabled TrickOrTreatManager to test for Lobby lockups. 2015-11-08 17:26:43 -06:00
Jonathan Williams fd3ccf7ce0 Fix Bungee lobby balancer code. 2015-11-08 17:25:54 -06:00
libraryaddict d466005c35 Fix custom names not changing 2015-11-09 05:08:08 +13:00
libraryaddict 752d8152d2 Merge pull request #72 in MIN/mineplex from iKeirNez_Bugfix to master 
* commit '783bec75db7592dc191698b8dfbb89be08a818aa':
  Fix for some preferences not applying correctly.
 2015-11-08 08:23:20 -06:00
libraryaddict 1999e09e69 Update CB 2015-11-09 02:44:16 +13:00
libraryaddict ce3af6cf9c Update cb.jar 2015-11-09 00:15:28 +13:00
AlexTheCoder 9e24a5005f - Completed CTF 2015-11-08 03:04:17 -05:00
AlexTheCoder 211298327f - Fixed banners, begun work on patterns 2015-11-08 02:42:31 -05:00
AlexTheCoder dfbf19c66a Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-08 01:02:06 -05:00
AlexTheCoder fb7fcccf24 - Reverting back to banners 2015-11-08 01:01:18 -05:00
libraryaddict e039f2249c Update cb 2015-11-08 18:02:36 +13:00
libraryaddict c4d6bcba02 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-11-08 17:56:34 +13:00
Shaun Bennett 3c82574386 Testing pushing/ignore this 2015-11-07 20:02:07 -05:00
Shaun Bennett bf97cf5d77 Remove debug code 2015-11-07 13:53:34 -05:00
libraryaddict 79d0466355 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2015-11-07 21:36:36 +13:00
libraryaddict 627ce08113 Add info on note particle 2015-11-07 21:35:26 +13:00
Shaun Bennett e1f56a5d5a Merge remote-tracking branch 'origin/master' 2015-11-07 01:10:34 -05:00
Shaun Bennett ec7600a4a2 Giveaway tweaks 2015-11-07 01:10:27 -05:00
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
AlexTheCoder fafc92606c Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
 2015-11-06 18:43:11 -05:00
Keir 783bec75db Fix for some preferences not applying correctly. 2015-11-06 23:04:51 +00: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
AlexTheCoder 87d7ff8a8f - Synced up expire times for proximity weapons 2015-11-05 02:21:36 -05:00
AlexTheCoder 61653347c7 - Fixed proximity weapons not being able to detonate 2015-11-05 02:11:20 -05:00
AlexTheCoder 9c49ab0408 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-05 01:23:40 -05: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