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 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
libraryaddict f71cb80bd0 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/minestrike/MineStrike.java
 2015-10-16 22:26:07 +13:00
Jonathan Williams 172bd65c57 Monster Maze motd. 2015-10-16 04:22:54 -05:00
libraryaddict 70c76d976f More changes 2015-10-16 22:10:13 +13:00
Jonathan Williams 62b209fede Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-16 01:57:30 -05:00
Jonathan Williams d00fa856f3 Fixed Pets so they work correctly. 
Also fixed legend benefits.
Fixed chest pet rewards.
 2015-10-16 01:57:19 -05:00
Cheese 016cea15f3 Merge branch 'Myst_HALLOWEEN' 2015-10-16 15:01:59 +11:00
Mysticate b8eb924ffa Fixed timing out. Yay. I'm done. G'night 2015-10-16 00:00:08 -04:00
Cheese 577c67cacd Merge branch 'Myst_HALLOWEEN' 2015-10-16 14:18:35 +11:00
Mysticate b15b81a7e2 Spacing 2015-10-15 23:09:23 -04:00
Mysticate f0a22d5c36 Fixed hammer throw 2015-10-15 23:02:51 -04:00
Mysticate f0e0d41c42 Fixed two things. 2015-10-15 22:23:49 -04:00
Cheese 6cc33fd6c6 Merge branch 'thanos-bug-fixes' 2015-10-16 12:53:43 +11:00
Mysticate 41511dce7b Merge remote-tracking branch 'origin/master' into monster-maze 2015-10-15 21:19:24 -04:00
libraryaddict 3dda9352e7 Progress 2015-10-16 13:32:23 +13:00
libraryaddict 4205dc6c25 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/halloween/Halloween.java
 2015-10-15 12:34:34 +13:00
Cheese 1c52bd4f64 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-14 14:34:51 +11:00
Cheese 86bad0be30 mods can check other players skills 2015-10-14 14:34:30 +11:00
Shaun Bennett 0df637b80a Run punishBot in main server thread 2015-10-13 22:56:14 -04:00
Mysticate a049d7666f Merge remote-tracking branch 'origin/master' into monster-maze 2015-10-13 22:14:19 -04:00
Cheese 45cd2a38e1 admins can botspam 2015-10-14 11:55:59 +11:00
Cheese 1842eae7f0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-13 23:22:58 +11:00
Cheese d105ea5d7e botspam addition 2015-10-13 23:19:48 +11:00
libraryaddict 58a86c5abb That's the easy stuff done.. 2015-10-13 19:49:15 +13:00
Jonathan Williams a292fdb3c5 Added failsafe for ServerMonitor. 2015-10-12 22:26:24 -05:00
Cheese f5b80c941c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-13 11:58:27 +11:00
Cheese e8388437b6 botspam now checks for chat as well 2015-10-13 11:58:14 +11:00
Cheese 3e5ac58ae9 helpers! 2015-10-13 11:23:00 +11:00
Cheese 37639a413c fixed skill stuff 2015-10-13 11:22:10 +11:00
Mysticate be96842de5 Ultra 2015-10-12 17:02:34 -04:00
AlexTheCoder dceba51060 - Fix random blockhunt bug with mounts and infestor 2015-10-12 03:09:40 -04:00
AlexTheCoder bbb863ba92 - Merge conflict patch 2015-10-12 02:36:10 -04:00
Cheese 2b9a66e7b2 more ssm update 2015-10-12 16:32:23 +11:00
Shaun Bennett 1aecc9505c Add region to titan, new MOTD 2015-10-12 01:30:31 -04:00
AlexTheCoder bef942f6da Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank 2015-10-12 00:47:56 -04:00
Cheese 6a173073a4 added flag to projectiles 
work on cow kit
 2015-10-12 14:39:14 +11:00
libraryaddict dab258dcdd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Libraries/BungeeCord.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
	Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
 2015-10-12 16:22:52 +13:00
Mysticate 3eb36a6581 Prevented farming 2015-10-11 22:43:21 -04:00
Mysticate 2abf3edad4 Made items for titanic cosmetics dyes. 2015-10-11 22:29:26 -04:00
Mysticate b6d573a4d5 Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-11 22:25:25 -04:00
Mysticate 7a4ccdf680 Bug fixes 2015-10-11 22:17:34 -04:00
Mysticate dda65b4c77 Fixed tnt exploding lobbies 2015-10-11 19:56:36 -04:00
Mysticate 20dd9c683b Merge remote-tracking branch 'origin/master' into monster-maze 
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java

Changed the scoreboard a bit, added it to MPS.
 2015-10-11 10:52:45 -04:00
Mysticate 606937d227 Fixed flashbang glitch 2015-10-11 09:42:36 -04:00
Jonathan Williams e6485a9009 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-10 23:02:36 -06:00
Jonathan Williams 5866e0cce6 Reducing max connections for the DBPool to 3. 2015-10-10 23:02:08 -06:00
Cheese f23bf18928 adhering to mysts OCD 2015-10-11 14:50:57 +11:00
Cheese f3e2f3c145 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-11 14:48:17 +11:00
Cheese cb9e8f8e0b pumpkin smasher achievement 2015-10-11 14:48:02 +11:00
Mysticate 435e74225a Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 2015-10-10 23:35:33 -04:00
Mysticate 83d1e011fc Changes. 2015-10-10 23:33:54 -04:00
Jonathan Williams 998d5f6984 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-10 21:25:29 -06:00
Jonathan Williams 061a7b7c73 Fixed Pet FK errors. 
Added SUPPORT to acceptable updateRank command.
 2015-10-10 21:24:47 -06:00
Cheese 8b75664627 queued holiday transactions 2015-10-11 12:54:35 +11:00
Cheese 6860fa608a titan placeholder perks 
art
fixed pumpkin gem count
 2015-10-11 11:26:09 +11:00
Mysticate 72d943f51b Restored skills to pre-eula ultra 2015-10-10 16:20:28 -04:00
Mysticate 5a8e500ec0 Fixed another thing 2015-10-10 16:15:10 -04:00
Mysticate 5e7ddb968e Changes and bug fixes. 2015-10-10 15:54:18 -04:00
Cheese da6b1316d3 removed pumpkins from MPS 2015-10-10 22:47:19 +11:00
Cheese 323842c693 fixed mods staying in flight 2015-10-10 19:36:38 +11:00
Cheese 6f14c75f70 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-10 19:28:26 +11:00
Cheese 6cf786eb8c Merge branch 'Myst_HALLOWEEN' 2015-10-10 19:28:08 +11:00
Cheese 1026a2ae22 fixed explosions 2015-10-10 19:27:54 +11:00
Shaun Bennett a242c6b592 Halloween Update finishes 2015-10-10 03:23:37 -04:00
Cheese e9207acd7f Merge branch 'alex-halloween' 2015-10-10 17:38:09 +11:00
Cheese 7bc3b4970b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
 2015-10-10 17:34:17 +11:00
AlexTheCoder 67a1f4ce8d Titan Giveaway: 
- Added Titan pumpkin animation
Titan Perks (For later, Removed from Menu):
- Added Kronos Particle
 2015-10-10 02:31:52 -04:00
Mysticate 930cfa5cb8 DONE 2015-10-10 02:30:11 -04:00
Shaun Bennett f1e9acbb58 Titan giveaway 2015-10-10 02:19:05 -04:00
Mysticate 245a42c8e0 animation is sexi 2015-10-10 02:13:04 -04:00
Mysticate 30a9196430 Done with animation. 2015-10-10 01:43:31 -04:00
Mysticate 9a7357e484 Work 2015-10-10 01:00:49 -04:00
Shaun Bennett 36fabf93b6 Merge remote-tracking branch 'origin/master' 2015-10-09 23:14:13 -04:00
Shaun Bennett bc7bf8a2e2 fixes/debug 2015-10-09 23:13:39 -04:00
Jonathan Williams 512e08af19 Removed all create table statements. 2015-10-09 21:02:35 -06:00
Mysticate 1127764cc3 Secsi 2015-10-09 22:44:49 -04:00
Mysticate 7851cb451a Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
 2015-10-09 22:34:05 -04:00
Shaun Bennett aa9fd1abf3 Titan giveaway work 2015-10-09 22:14:10 -04:00
Mysticate 90c685617d Animation 2015-10-09 22:14:01 -04:00
Peter Miller 611fb88f15 Commented out unnecessary table creation statements (tables already exist in database and these statements are causing database lag under high player load). 2015-10-09 20:40:50 -04:00
Cheese ed89f5f4cc anim example for myst 2015-10-10 10:46:12 +11:00
Cheese 43f38c18ee animation 2015-10-10 10:40:44 +11:00
Cheese d99c64e45d fixed merge error 2015-10-10 10:37:20 +11:00
Cheese 02c6eccfda Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
 2015-10-10 10:36:42 +11:00
Cheese 7dbd9da582 dragon sale Bar 2015-10-10 10:35:48 +11:00
Shaun Bennett ba36ff565d Merge remote-tracking branch 'origin/master' 2015-10-09 18:23:55 -04:00
Shaun Bennett 97ef4a4252 Pushing titan giveaway stuff for laptop 2015-10-09 18:23:47 -04:00
Jonathan Williams 586cc6e3e0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-09 09:40:58 -06:00
Mysticate ff1431b652 Fixed players glitching to chests before game starts. 2015-10-09 10:21:35 -04:00
Cheese ff42e05a8d Merge branch 'Myst_HALLOWEEN' 2015-10-09 14:20:58 +11:00
Cheese 99fd88473b rank colors 2015-10-09 14:20:02 +11:00
Mysticate fb4d08931c Spider mount improvements. 2015-10-08 23:18:37 -04:00
Cheese d9dd471db6 removed annoying debug 2015-10-09 14:04:12 +11:00
Cheese c03c8163c5 fixed exploision stuff 2015-10-09 14:01:58 +11:00
Mysticate 90d0fcb36d Merge branch 'Myst_HALLOWEEN' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into Myst_HALLOWEEN 2015-10-08 22:53:45 -04:00
Mysticate 598ea84e7a Fixed explosions and cleaned up. 2015-10-08 22:52:57 -04:00
Cheese d18353e592 Merge branch 'Myst_HALLOWEEN' of ssh://184.154.0.242:7999/min/Mineplex into Myst_HALLOWEEN 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
 2015-10-09 13:44:41 +11:00
Cheese 41678eaf35 fixed scoreboard bug 2015-10-09 13:42:37 +11:00
Mysticate 1011c36c43 Fixed lobby being destroyed. 2015-10-08 22:41:45 -04:00
Mysticate 96f14f4fda Fixed kit item names. 2015-10-08 22:31:20 -04:00
Mysticate 3802d47a37 Made the thing bold. 2015-10-08 22:29:22 -04:00