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

4388 Commits

Author SHA1 Message Date
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
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
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
Cheese b9d7c80f80 cow kit 2015-10-31 13:25:57 +11:00
libraryaddict 301b8012ff Final commit 2015-10-30 19:30:17 +13:00
libraryaddict ea1e4b79f7 Changes from SnD branch 2015-10-30 19:25:02 +13:00
libraryaddict ed18588a6a Fix missing code and stuff 2015-10-30 19:12:04 +13:00
libraryaddict da0a99d662 Spawn facing fixes 2015-10-30 16:06:47 +13:00
libraryaddict 50edf557ab Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-10-30 15:57:36 +13:00
libraryaddict 388aa1611c Update craftbukkit, add new vegetate head, fix maze, fix SG and UHC borders, fix gust, modify kits to use new vegetate 2015-10-30 15:44:37 +13:00
Cheese c4e93180fa Merge branch 'master' into smash-champs-balance 2015-10-30 13:00:30 +11:00
Shaun Bennett e2947718fe Remove code that wasnt meant to be commited 2015-10-29 13:10:10 -04:00
libraryaddict 7fca42b0e0 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/game/games/turfforts/TurfForts.java
 2015-10-29 21:41:59 +13:00
libraryaddict 14df456b3d Progres 2015-10-29 21:39:38 +13:00
Aaron Brock acc915c34e Re-added my TurfForts patch, as well as fixed the "Game Changes to build time while spectating so you don't get your blocks" glitch. 2015-10-29 01:12:12 -04:00
Aaron Brock 8dd80094b4 Fixed a little boolean derp that stopped people from breaking blocks. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
(cherry picked from commit 1f0accd)
 2015-10-28 23:26:18 -04:00
Aaron Brock 9df297fc11 Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist. 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
(cherry picked from commit 76e4dc6)
 2015-10-28 23:25:56 -04:00
libraryaddict 0486404c4b 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-10-28 14:38:34 +13:00
libraryaddict 5ec932d1ca Fixing bugs 2015-10-28 14:36:48 +13:00
AlexTheCoder 57da1d195a - Resolved randomly using java 8 in this one plugin 2015-10-24 20:50:47 -04:00
AlexTheCoder 08fd1b5790 - Fixed MPS Whitelist for usernames with non-lowercase characters 2015-10-24 20:49:09 -04:00
Shaun Bennett 556d5adcd9 Change /global to /globalpacket (fixes conflict with announcement command) 2015-10-24 17:46:25 -04:00
Shaun Bennett 0d56eefd44 Titan/Rewards adjustments 2015-10-24 13:40:17 -04:00
libraryaddict e3c824c512 Fix minor skywars error 2015-10-24 13:32:55 +13:00
libraryaddict 4d2b359aad Fix wolf cub strike 2015-10-24 08:41:10 +13:00
libraryaddict 43cd0f86a9 Fix players unable to break blocks at spawn 2015-10-24 08:40:57 +13:00
libraryaddict 7f025ad029 Fix CustomExplosion 2015-10-24 08:40:43 +13:00
Shaun Bennett 40afcaf26b Global Packet Commands 2015-10-23 15:07:53 -04:00
libraryaddict 2eb8b3e234 Catch PacketHandler exceptions 2015-10-24 02:17:19 +13:00
libraryaddict 5ec4203fd9 More changes to disguise 2015-10-24 01:36:42 +13:00
libraryaddict a450b828b7 Fix disguises custom name 2015-10-24 00:48:54 +13:00
libraryaddict de9678a20f Modify Craftbukkit 2015-10-23 21:28:01 +13:00
Cheese af208da953 Merge branch 'alex-testrank' 2015-10-23 18:10:59 +11:00
Cheese d9d0254e46 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-23 17:30:59 +11:00
Shaun Bennett e3e7dd4694 Titan rewards from mythical chests 2015-10-23 02:08:31 -04:00
AlexTheCoder 1512d87f9e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank 2015-10-23 00:28:32 -04:00
libraryaddict aedf04b3e3 Fix renaming pet not opening proper window 2015-10-23 09:26:21 +13:00
libraryaddict 53aa1b655b Remove custom formatter because it trims too short, don't need to commit it. Cleaned up CustomTagFix 2015-10-23 09:20:24 +13:00
libraryaddict 8cde506a2c Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-10-23 05:25:36 +13:00
libraryaddict ddb8d592f8 Remove all is1_8 checks 2015-10-22 18:37:14 +13:00
William Burns e6bec41ca8 Fix "code too large" error. 2015-10-21 20:29:44 +01:00
libraryaddict 3cd803cda0 Update patch files and cb 2015-10-22 08:07:10 +13:00
libraryaddict 5c010af8c4 Add updatehealth packet 2015-10-21 19:56:52 +13:00
Jonathan Williams c719d693dd Added delete benefit call for repository. 
Added failsafe in case inventory update didn't apply
Removed 43k benefit.
 2015-10-21 01:15:09 -05:00
Cheese 768ef4eb97 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-21 13:00:16 +11:00
libraryaddict 8ceb69513a Update patches and cb.jar 2015-10-21 05:05:27 +13:00
libraryaddict 07f032a5d2 Fix wither pet making sounds, fixed worldtime. 2015-10-21 04:22:31 +13:00
libraryaddict ddd674e371 Packets implement Pcaket right 2015-10-20 17:19:46 +13:00
libraryaddict b3caf7c2d4 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-10-20 04:38:12 +13:00
libraryaddict 5d671d3300 Fix borders 2015-10-20 04:37:42 +13:00
Jonathan Williams 3ef33bd9c5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-19 01:32:23 -05:00
Jonathan Williams 5e307da15a Fix for inventory failure. 2015-10-19 01:32:12 -05:00
Shaun Bennett 6d7f15cd6d Fix hub time after light flicker 2015-10-18 18:52:16 -04:00
Cheese c7a5be9570 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-19 09:03:46 +11:00
libraryaddict 55f97ef984 More fixes, along with a fix for Block Hunt 2015-10-19 06:21:16 +13:00
Jonathan Williams 9e7629b1fe Added 43k player chest benefit. 
Updated MOTD.
 2015-10-18 00:21:01 -05:00
Cheese d901cfa12c buildies can join full 2015-10-18 10:54:34 +11:00
libraryaddict 6f91827d57 Vector to Vector3f, updated Maze to 1.8 2015-10-18 12:40:01 +13:00
libraryaddict 02bf202d52 1.8 update 2015-10-17 13:21:03 +13:00
libraryaddict 3a0781b3c7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
 2015-10-17 00:10:32 +13:00
libraryaddict 14a524cf54 Stuff 2015-10-17 00:08:30 +13:00
Cheese 41b6fdc74e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-16 21:47:35 +11:00
Cheese 32489388c6 removed bug fix that caused SG break 2015-10-16 21:47:22 +11:00