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

7193 Commits

Author SHA1 Message Date
Jonathan Williams 91ddac9643 Added world checking for boundary stuff. 2016-04-04 10:30:59 -05:00
Jonathan Williams e8da5ca0f2 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-04 10:02:01 -05:00
Jonathan Williams 228a001696 Added Shift Left clicking to the ban list for Cannon :D 2016-04-04 10:01:50 -05:00
Shaun Bennett ff929a8515 Merge remote-tracking branch 'remotes/origin/develop' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
 2016-04-05 00:57:28 +10:00
Ben 14207c2073 clansbans 2016-04-04 14:56:20 +01:00
Ben 8330ef560d not rider spam 2016-04-04 14:55:47 +01:00
Shaun Bennett fecd3c1eaa Final changes 2016-04-04 23:28:38 +10:00
Ben 02cb0e1f7e Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java
 2016-04-04 13:52:44 +01:00
Ben 1dde17b9cc shooters still shotting fix 2016-04-04 13:51:05 +01:00
phobia e85a1e6a3b fixes to breakingand placing in claim 2016-04-04 22:22:07 +10:00
phobia 4262a4d4b7 Increase radius + delete iron doors after done 2016-04-04 22:07:58 +10:00
phobia 963bba06f7 fix for displaying territorial movements 2016-04-04 17:47:58 +10:00
phobia 2e0c9d3965 Remove potatoe message 2016-04-04 17:34:39 +10:00
phobia aaccb6fd48 Join/leave/death messages 2016-04-04 17:20:21 +10:00
Shaun Bennett 15c4b2dd58 Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-04-04 17:11:15 +10:00
Shaun Bennett 23e116f9b5 Region fixes 2016-04-04 17:10:52 +10:00
phobia 56a087612b Changes to explain energy goal 2016-04-04 16:58:16 +10:00
Shaun Bennett be8ed78caa Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-04-04 16:46:17 +10:00
Shaun Bennett 02f774ce94 A lot of bug fixes 2016-04-04 16:45:20 +10:00
Jonathan Williams 85fabd525a Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-04 00:59:25 -05:00
Jonathan Williams 400d2f0cca Added bonus log view for customer support. 2016-04-04 00:59:13 -05:00
Shaun Bennett 543719b95d More tutorial fixes 2016-04-04 14:47:33 +10:00
Cheese 040026724b renamed tutorials 2016-04-04 14:10:26 +10:00
Cheese 29bcd6aeea more text cahnges 2016-04-04 13:30:15 +10:00
Cheese 88e56f2ffb Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java
 2016-04-04 13:03:24 +10:00
Cheese 6c92b42335 text changes 2016-04-04 13:01:54 +10:00
Shaun Bennett 29f2442be8 Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-04-04 12:53:07 +10:00
Shaun Bennett 8dee8eab0a Bug fixes 2016-04-04 12:52:52 +10:00
phobia 3173adca53 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-04 12:49:00 +10:00
phobia 5ad877f864 So many fixes <3 2016-04-04 12:47:23 +10:00
Shaun Bennett 0a39b7b756 Fix objective ordering 2016-04-04 12:36:47 +10:00
Shaun Bennett e11a9379b9 More tutorial tweaking 2016-04-04 12:32:22 +10:00
phobia 5195e4a13d Message fixes 2016-04-04 10:15:15 +10:00
phobia c3a119cfe4 Display completion only to player who completes 2016-04-04 10:11:26 +10:00
Ben a1f284670a make zombie npcs actually look at the player 2016-04-03 23:49:22 +01:00
Ben 3ff5e6d337 npc fixes 2016-04-03 18:47:31 +01:00
Ben 7558bd01b7 ensure zombies don't burn to death, by losing equipment 2016-04-03 18:29:13 +01:00
Ben 40361acc9b fixed cannon becoming off-center 2016-04-03 17:51:56 +01:00
Ben ccdd1f901f cannon 1.9 fixes 2016-04-03 17:23:55 +01:00
Ben f4d4b5c5df siege weapon interaction fix 2016-04-03 14:08:40 +01:00
Ben 66a18dcc87 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java
 2016-04-03 13:55:17 +01:00
Ben c1b659e738 npcs on enemy base 2016-04-03 13:50:11 +01:00
Ben f5623f00f9 blacklist npe fix 2016-04-03 13:47:57 +01:00
phobia 3ae347653a Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-03 21:33:13 +10:00
phobia c92d291e96 Shift clicking TNT into the cannon + iron doors fixed 2016-04-03 21:32:56 +10:00
Jonathan Williams 8f58a456b1 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-03 01:37:40 -05:00
Jonathan Williams 401127caa9 Reworked Monthly bonuses so they always succeed and it logs them. 2016-04-03 01:36:30 -05:00
phobia 759911396a More clans bug fixes + message tweaks 2016-04-03 16:11:47 +10:00
phobia 5e41c22fc7 - The "WARNING: Clan energy is running very low" message should appear after I get the Buy Energy objective 
- Need a congrats message/title when tutorial is completed
- Force user to claim via gui
 2016-04-03 13:39:32 +10:00
phobia 45cbeef83d - /c sethome shows the wrong message when the bed can't be placed 2016-04-03 13:32:49 +10:00
phobia 9f4a2ff7ce - Shift clicking TNT into the cannon does not work 
- /c map doesn't work in tutorial (could just remove /c map completely)
 2016-04-03 13:31:13 +10:00
phobia 664d8b1a4e Fixes for clans tutorial 2016-04-03 11:04:57 +10:00
phobia b4cfbebf3f Fix issue with seeling potatoes 2016-04-02 22:53:41 +11:00
phobia d4e9f638da Fixed a crash bug with title message being too long + other fixes 2016-04-02 22:26:21 +11:00
phobia cc09bf6b51 Fixes to Bull Charge + Adding more instructins to purchasing 2016-04-02 21:43:33 +11:00
William Burns 15cf7f574d Fix join/quit messages. 2016-04-02 11:08:40 +01:00
William Burns 6072753624 Fix shop objective description. 2016-04-02 10:50:46 +01:00
Shaun Bennett b960925522 Fixes 2016-04-02 20:42:41 +11:00
phobia 5a31be1138 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-02 20:33:09 +11:00
phobia 673dd327ff Push for shaun Fireworks 2016-04-02 20:29:56 +11:00
Jonathan Williams e4b2492b35 Fixed ObjectiveGoal's finish from creating CCMs. 2016-04-02 03:03:17 -05:00
Jonathan Williams ff41ad248a Removed PvpTimer 
Fixed issue where StatManager and FriendManager were created twice.
 2016-04-02 02:47:17 -05:00
Jonathan Williams a6710280fb Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-02 00:45:10 -05:00
Jonathan Williams 01d9c1cd09 Finished the <?> for Objective and ObjectiveGoal. 2016-04-02 00:45:01 -05:00
Shaun Bennett d161d83d12 Maps and other various fixes 2016-04-02 15:43:03 +11:00
Shaun Bennett 5739b1b87b Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-04-02 15:13:16 +11:00
Jonathan Williams 3bc1908b57 Fix player quit staying in _active list for Objectives. 2016-04-01 23:10:15 -05:00
Shaun Bennett 758004f207 Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-04-02 14:55:14 +11:00
Jonathan Williams fa6d18b0fa Fix sync db call inside sendMessage 2016-04-01 22:43:09 -05:00
Cheese 8f959a73eb debug 2016-04-02 12:46:25 +11:00
Cheese 9969b7d783 support for resource packs for different MC versions 2016-04-02 11:39:40 +11:00
Shaun Bennett 0abcd0044b Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-04-02 10:53:28 +11:00
Joseph Prezioso Jr 6e23a17acb Removed unnecessary code. 2016-04-01 16:01:57 -04:00
phobia 90e336b18e Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-01 21:51:51 +11:00
phobia 42fd210b20 PC-56 2016-04-01 21:51:31 +11:00
Jonathan Williams fe41e79e8a Fixes: 
10 minute timer for creating clan after tutorial.
CCM with LeaveSpawnGoal
Synchronous database calls.
 2016-04-01 01:55:08 -05:00
phobia 9a1e5099a4 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-01 14:04:12 +11:00
phobia d0bc40b991 PC-56 and PC-65 2016-04-01 14:01:38 +11:00
Shaun Bennett 49441cfaf4 PC-63 and PC-64 2016-04-01 10:47:21 +11:00
Ben 3412082f37 PC-61 - Remove all diamonds from inventory after sell diamonds objective 2016-04-01 00:33:42 +01:00
Ben da99a12b23 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-31 20:03:50 +01:00
Ben d353c53524 remove hard-coded access to certain commands for my uuid/name 2016-03-31 20:03:25 +01:00
Joseph Prezioso Jr 5e1003cccb Missed a minus sign in my previous commit. 2016-03-31 14:06:45 -04:00
Joseph Prezioso Jr 6ccc6df6aa Elo calculations now account for player's Elo, relative to the average Elo among players 2016-03-31 13:57:21 -04:00
William Burns 4ec833727f PC-20 - Detailed Objective Text 2016-03-31 18:45:17 +01:00
Joseph Prezioso Jr cbb9798c35 Added AdjustPlayertElo method to increment/decrement the Elo's of individual players at the end of a game. Currently calling the new method in AnnounceEnd. 2016-03-31 12:49:22 -04:00
phobia 19b2b00a13 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-31 20:35:40 +11:00
phobia 86bdbbb8bc PC-46 + adding in events for buttons 2016-03-31 20:35:21 +11:00
Shaun Bennett 682c365bc6 Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-03-31 20:09:16 +11:00
Shaun Bennett b3392e78f5 PC-28 - Improve Flow of Tutorials 2016-03-31 20:08:45 +11:00
AlexTheCoder 4ae4f056ea - Map Polish 2016-03-31 03:46:43 -04:00
AlexTheCoder 40175db217 - Lots of polish 2016-03-31 03:41:07 -04:00
Shaun Bennett 30a098c645 PC-49 - Kick players out of their clan when they start the tutorial if they have one (from previously playing the tutorial). 2016-03-31 18:24:47 +11:00
Shaun Bennett 7c70092f3b PC-48 - Create a hologram saying "Jump Off" at the edge of spawn island 2016-03-31 18:19:06 +11:00
Shaun Bennett e7b9d866ae PC-57 - Rename Identify Fields to Identify Fields on Map 2016-03-31 17:10:56 +11:00
Shaun Bennett c51830145e PC-58 - Close gate to the fields after you sell diamonds 2016-03-31 17:09:51 +11:00
Shaun Bennett f229da1327 PC-55 - Remove all potatoes from inventory when player completes "Sell Potatoes" 2016-03-31 17:08:26 +11:00
Shaun Bennett 25975e47b8 PC-54 - Rename Identify Shops to Identify Shops on Map 2016-03-31 17:07:08 +11:00
Shaun Bennett 7867da277d PC-52 - Rename Identify Enemy Clan to Identify Enemy on Map 2016-03-31 17:05:59 +11:00
Shaun Bennett 50518250de PC-51 - Rename randomClan to EnemyClan 2016-03-31 17:02:38 +11:00
Shaun Bennett 44abf8f1e2 Naming fixes 2016-03-31 16:47:16 +11:00
Ben 62280a8fa5 Fix diamond from flying far away when breaking diamond blocks in the fields 2016-03-31 01:11:30 +01:00
Ben 622843ca8e PC-47 - Remove item drops from tutorial cannon hit 2016-03-31 01:08:01 +01:00
Ben 0fd39e1300 missing event 2016-03-31 00:47:06 +01:00
Ben 36caf16c9a Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-31 00:03:12 +01:00
Ben 0f22c4359d PC-19 - Remove World Event messages for players in Tutorial 2016-03-31 00:02:51 +01:00
Joseph Prezioso Jr b1c29a4fa6 Setup proper Elo brackets with the top 1% being placed in diamond. Also changed starting Elo to 1400 (middle of Iron 1), leaving Coal as a purely regressive division. 2016-03-30 16:06:30 -04:00
phobia 978f978023 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-30 23:01:55 +11:00
phobia d6560fcf5c Fixes to Clan info goal 2016-03-30 23:01:39 +11:00
Shaun Bennett 5652eb75cf Fix NPE in MountCannonGoal 2016-03-30 22:33:23 +11:00
William Burns 5149043d14 PC-38 - Don't open gate until player is 12 blocks away 2016-03-30 01:09:29 +01:00
William Burns ed65f19417 PC-42 - Fireworks and Effects at end of tutorial 2016-03-29 23:41:31 +01:00
Joseph Prezioso Jr 00ee594f28 Missed one file last time 2016-03-29 17:50:45 -04:00
Joseph Prezioso Jr 6048c97b52 Tweaks to clean/clarify things 2016-03-29 17:50:06 -04:00
Joseph Prezioso Jr 51cd770d38 Changes to help smooth the transition into using EloSettings. 2016-03-29 16:00:57 -04:00
Joseph Prezioso Jr 35fc5223b1 reverted previous changes back to lastIndexOf (and altered comments accordingly) on the advice of SJSampson (with whom Sigils agreed) 2016-03-29 14:03:21 -04:00
Joseph Prezioso Jr 0c479e1562 Made change to Elo calculation under Sigils' advisement. Now using indexOf, rather than lastIndexOf to find Elo 2016-03-29 14:00:59 -04:00
William Burns 1d4472255f PC-40 - Add cooldown to Tutorial /c home 2016-03-29 18:50:28 +01:00
Joseph Prezioso Jr f496392c5a EloDivision class created. 
EloManager can now calculate division ranking (EloDivision can also do this once we are ready for it to)
 2016-03-29 13:49:59 -04:00
William Burns 0bbfbff0b8 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-29 18:03:49 +01:00
William Burns 2fcd809447 PC-34 - Effects/Particles when you blow up enemy 2016-03-29 18:03:28 +01:00
phobia cd2d4c0f37 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-29 22:47:39 +11:00
phobia e75c7a3c91 PC-29 + fixes 2016-03-29 22:47:03 +11:00
phobia eab7cbe385 PC-35 2016-03-29 16:29:03 +11:00
William Burns f2d450d26b PC-30 - Claim land objective should use clan GUI 2016-03-29 00:07:50 +01:00
William Burns fc473275b0 PC-37 - Move Identify shops objective before go to shops 2016-03-29 00:02:07 +01:00
Joseph Prezioso Jr 38a079846d Some basic ideas for Elo I will be experimenting with 2016-03-28 18:14:52 -04:00
Joseph Prezioso Jr d8d952691b cleaning up my code a bit 2016-03-28 13:40:34 -04:00
Joseph Prezioso Jr abcdadc8d0 Corrected a small error in GameOption. 2016-03-28 12:40:41 -04:00
William Burns f8211f26cc PC-18 - Remove PVP Safety Message in Tutorial 2016-03-28 13:36:43 +01:00
William Burns 3d0d7f9d71 PC-43 - Remove join/quit messages while in tutorial 2016-03-28 12:38:57 +01:00
phobia fd3a04e794 Fixes for tutorial 
PC-39    "about energy"
PC-32    Tutorial set home bed
PC-27    Change /c GUI for creating clan
PC-41    Disband via gui not command in tutorial
 2016-03-28 22:13:28 +11:00
Shaun Bennett fa0594b5db PC-24 - Update Spawn Island Hologram 2016-03-28 13:55:37 +11:00
Shaun Bennett 9ff7e2da82 PC-21 - Combine Tutorial 1 and 2 2016-03-28 11:52:18 +11:00
Shaun Bennett f7c57a7699 PC-22 - Update Scoreboard Text 2016-03-28 11:47:16 +11:00
Shaun Bennett 8c1b91cbf5 PC-23 - Hotbar Flashing Text 2016-03-28 11:37:35 +11:00
Shaun Bennett 2d30983711 Adjust visuals 2016-03-28 11:29:15 +11:00
Ben 1aa4b4a47d remove player from tutorial on kick 2016-03-27 15:36:54 +01:00
Ben e4e40baf52 final stuff 2016-03-27 06:48:23 +01:00
Ben b4d340a655 cb fixed 2016-03-27 06:21:32 +01:00
Ben a175ead44a finished tutorial! 2016-03-27 05:43:31 +01:00
Ben a30a591b58 disable certain clans commands whilst in tutorial 2016-03-27 02:04:33 +01:00
Ben a8bd0e4406 add current Clan Outpost to travel shop 2016-03-26 23:20:03 +00:00
Ben 2070f0925d teleport to spawn after tutorial ends 2016-03-26 22:49:06 +00:00
Ben 0559ad9567 remove "you have not set a home" message and added a set home message 2016-03-26 22:45:20 +00:00
Ben 23cfa8ec25 mine diamonds fix (have to mine 11 instead of 10) 2016-03-26 22:36:27 +00:00
Ben f201898420 mine diamond fix 2016-03-26 22:35:06 +00:00
Shaun Bennett 970d5a307c Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-03-27 09:17:39 +11:00
Shaun Bennett bace0b2557 Add Mining shop Location 2016-03-27 09:14:12 +11:00
Ben 9e0ba029b4 uhhh what 2016-03-26 22:10:19 +00:00
Shaun Bennett caf8170a32 Tutorial Changes 2016-03-27 08:47:34 +11:00
AlexTheCoder 2530bc512e - Fixed some more buggies 2016-03-26 14:02:18 -04:00
William Burns c1adb7e1bc Remove Slack attachment functionality (for now). 2016-03-26 13:12:59 -04:00
William Burns 29966195ee Create an API for sending Slack message to multiple teams and channels. 2016-03-26 13:07:41 -04:00
AlexTheCoder bb28b7ad89 - Forgot to comment out 2 lines 2016-03-25 20:27:17 -04:00
AlexTheCoder 6678dffb61 - Updated everything for Sigils and chiss 2016-03-25 20:25:43 -04:00
Joseph Prezioso Jr 57a1e06406 no message 2016-03-25 20:11:35 -04:00
Joseph Prezioso Jr f7575360db Setting up a class to handle Materials as GameOptions 2016-03-25 16:42:39 -04:00
Joseph Prezioso Jr 05ede7910e All errors have been fixed. 2016-03-25 15:27:11 -04:00
Joseph Prezioso Jr 262c6c2fa6 Quick Lunch-time bug-squashing update. Still have tons of errors to go through, but I want to make sure everything is backed up, should the weather turn foul(er) and a power outage should occur 2016-03-25 13:53:20 -04:00
Joseph Prezioso Jr c1ef185e82 Flags have been changed and I have started to get rid of the errors that have started cropping up. 2016-03-25 12:48:39 -04:00
Ben a35bbeefdd attack enemy goals 2016-03-25 12:38:01 +00:00
Ben dade54e5fe Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-25 04:02:16 +00:00
Ben 195c990e29 further tutorial progress 2016-03-25 04:01:57 +00:00
Shaun Bennett 8c7d653cca Store location for teleport home 2016-03-25 13:13:15 +11:00
Shaun Bennett 8afed30c5a basic classes objectives 2016-03-25 13:07:53 +11:00
Ben d23804be70 fixes for shaun 2016-03-25 01:33:55 +00:00
Ben 87b1bf7dd0 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java
 2016-03-25 01:30:46 +00:00
Ben 3cd7a5f12a NPE fix for cannons and more 2016-03-25 01:29:55 +00:00
Shaun Bennett c221e0e24f Fix potatoes 2016-03-25 12:26:13 +11:00
Ben 17c214c282 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java
 2016-03-25 00:08:28 +00:00
Ben 88b0ea1b72 tutorial progressss es 2016-03-25 00:06:51 +00:00
Shaun Bennett d5a89dc7fe Push for ben again 2016-03-25 11:05:05 +11:00
Joseph Prezioso Jr 667ec03f06 Still a few more flags to go. I'll get to them tomorrow. Hopefully, I'll also figure out where/if I need to change things elsewhere in the code. 2016-03-24 18:43:02 -04:00
Shaun Bennett 7c06186a4f Fix cleanup and setup 2016-03-25 09:42:41 +11:00
Joseph Prezioso Jr eb6c385936 More flags changed 2016-03-24 17:52:02 -04:00
Joseph Prezioso Jr 0246ec275e More flags have been changed to use the new Game Options. WHY IS NOTHING BREAKING!? Not that I'm complaining. Just really confused... 2016-03-24 17:47:07 -04:00
Shaun Bennett 628604c353 Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-03-25 08:44:08 +11:00
Shaun Bennett 051539dbf6 Add cleanup and setup 2016-03-25 08:43:37 +11:00
Ben af87dc9384 unsynchronized siege weapon support 2016-03-24 21:26:40 +00:00
Ben c381cc8fd7 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-24 21:14:34 +00:00
Ben cfb84dd545 fixes for shaun 2016-03-24 21:14:13 +00:00
Shaun Bennett 85511b4c26 Fixes for ben 2016-03-25 08:13:30 +11:00
Joseph Prezioso Jr b5d3a6b8c3 Small fix to last commit so that everything works while I continue working on getting GameOptions working 2016-03-24 16:34:16 -04:00
Joseph Prezioso Jr 4e02258124 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
 2016-03-24 16:32:33 -04:00
Ben f000360565 missing a few files 2016-03-24 19:29:45 +00:00
Ben 2ef604aeaf attack enemy goal 2016-03-24 19:11:05 +00:00
Ben 7920f2729b Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-24 08:59:09 +00:00
Ben 2eb4d89875 i think clans ban is broken in this commit, and i removed some unnecessary spammy debug messages. 2016-03-24 08:58:48 +00:00
Shaun Bennett 4e26d2c7f1 Push code for ben 2016-03-24 19:37:56 +11:00
Shaun Bennett 2a89896084 Tutorial 2016-03-24 17:32:44 +11:00
Shaun Bennett dbd9567abb Tutorial work 2016-03-24 15:22:07 +11:00
Jonathan Williams 105f62e563 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop 2016-03-23 16:02:30 -05:00
Jonathan Williams ee22274ef5 Removed Stacker debug messages. 2016-03-23 16:02:06 -05:00
Shaun Bennett 3d473ad00a Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-03-23 20:39:21 +11:00
git 4dd756286e Fix small resource pack bug 2016-03-23 20:32:13 +13:00
Shaun Bennett e8dcc4a3e2 Merge branch 'develop' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2016-03-23 11:02:20 +11:00
Shaun Bennett 1e73adf2af Increase ram and cpu for event server 2016-03-23 10:23:04 +11:00
Shaun Bennett 656780d027 Change runAsync in MiniPlugin to use our own thread pool 
This allows the tasks to run immediately. Using Bukkit's scheduler the async task wont start until the next server tick
 2016-03-23 10:22:40 +11:00
Shaun Bennett da9a642a6d Process item for treasure before opening 2016-03-23 10:21:36 +11:00
Shaun Bennett 309b5464f2 Clean up Account Repository, attempt to load account ID from cache 2016-03-23 10:21:02 +11:00
Shaun Bennett a107c38f28 Comment out missing ring game kit so we can compile 2016-03-23 10:18:22 +11:00
Shaun Bennett 85cb065d5c Merge pull request #14 from Mineplex-LLC/Dual_1.9 
1.9 Bugfixes + Ring game
 2016-03-22 19:25:37 +11:00
Jonathan Williams c9fdd83e17 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop 2016-03-21 20:31:04 -05:00
Jonathan Williams 2cff7003e6 Added more debug to Stacker interaction. 2016-03-21 20:30:54 -05:00
Ben 2e41f906d0 moved completely to database managed clan blacklist, instead of the old hard-coded way 2016-03-21 22:37:35 +00:00
Shaun Bennett 61b79fab9d Merge pull request #13 from Mineplex-LLC/PC-15 
Fix PC-13, PC-15, PC-16, PC-17
 2016-03-21 20:31:58 +11:00
Jonathan Williams b4dfeb224b Reduced NCP exempt time by .5s. 2016-03-21 02:06:11 -05:00
Ben 264e5d34b2 missing some files 2016-03-21 05:52:02 +00:00
Jonathan Williams faf6834e23 Added some protection for stacker and offline players. 2016-03-20 16:27:59 -05:00
Jonathan Williams 750b960b46 Fixed references to snake events. 2016-03-20 16:24:11 -05:00
Jonathan Williams 109190ee58 Moved snake events to their own classes. 
Memory cleanup for Snake.
 2016-03-20 15:54:04 -05:00
Jonathan Williams 262f659ffa Fix with TurfForts infinite while loop. 2016-03-20 15:46:57 -05:00
Jonathan Williams 3bc8dd0098 Fixed bug with infinite loop in Bridges MushroomSpawn. 2016-03-20 00:32:33 -05:00
Ben 723f62b8f9 incognito fixes and loads of other fixes 2016-03-20 01:06:46 +00:00
Jonathan Williams 8427ead097 Changed how currency types is initialized to avoid possible NPE 2016-03-19 15:33:16 -05:00
Ben ef1d6ede24 many fixes 2016-03-19 06:31:37 +00:00
Ben a21d43e58f fix NPE 2016-03-19 06:13:39 +00:00
Ben c4fbae4bd1 added clan name blacklist and changed clans ban GUI 2016-03-19 06:11:32 +00:00
Ben 6172be5d76 few changes 2016-03-19 00:13:31 +00:00
Ben 2e9562fc50 fixed NPE with one of the tutorial goals. fixed silent chest. fixed invsee, updated regions for new map 2016-03-18 22:31:36 +00:00
Ben 8c7da5e98a some goals didn't commit 2016-03-18 03:01:42 +00:00
Ben 3ba138a8d7 some more objectives. 2016-03-18 03:01:11 +00:00
Ben 995d454f87 tutorial additions. 2016-03-18 02:47:51 +00:00
Ben 3b764920e1 duplicate messages 2016-03-18 01:22:15 +00:00
Ben a4cbe54c78 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2016-03-18 01:21:25 +00:00
Ben 2cf59ced8b new pvp timer management, fixed build house task, fixed incognito 2016-03-18 01:18:35 +00:00
Ben a3db70ad9c clear player inventory on tutorial start (and give map) 2016-03-17 09:44:03 +00:00
Ben e6f4375041 build house goal [still broken] 2016-03-17 02:23:05 +00:00
Ben 929981419e disable item dropping & block breaking 2016-03-17 01:52:36 +00:00
Ben add651780b priority chat filters, fixed siege weapon clicking listeners being incorrect 2016-03-17 01:06:07 +00:00
Ben b164ff0729 Update res pack 2016-03-16 23:56:39 +00:00
Ben 1c1ed1613a allow kill command while in void/after other damage methods 2016-03-16 23:56:30 +00:00
Ben d625b20ea8 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
 2016-03-16 22:48:04 +00:00
Ben 93767b7a90 tutorial changes, chat filter system, commented out all web stuff for analytics. 2016-03-16 22:46:18 +00:00
Ben 2c9021fb81 some chat formatting 2016-03-16 22:31:35 +00:00
Joseph Prezioso Jr 7cf49dbe3b Refactored code to correct errors from previous commit 2016-03-15 20:46:30 -04:00
Joseph Prezioso Jr 5fdd3e0872 Updated North, South, East, and West Spawns and Centers 2016-03-15 20:12:09 -04:00
Ben 0d237370e1 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-15 23:33:09 +00:00
Ben 7589c63904 analytics progress 2016-03-15 23:32:56 +00:00
Ben 8897f2e86e fixed NPE 2016-03-15 23:11:08 +00:00
Ben 4638ba909d siege weapon finalizations & analytics (wip) 2016-03-15 22:52:13 +00:00
Keir Nellyer 25075597f2 Only allow Ultra+ players to use /report whilst it's in beta testing. 2016-03-15 17:43:16 +00:00
Shaun Bennett 4e85a315f9 Objectives! 2016-03-15 11:50:35 -05:00
Shaun Bennett e53b8616d1 A ton of tutorial work 2016-03-15 10:29:43 -05:00
Ben d7de4381a3 add 200ms damage delay to cannon damages. and add temporary damage holograms 2016-03-15 00:49:37 +00:00
Ben 813a3833ae implement temporary holograms 2016-03-15 00:48:50 +00:00
Ben 13bbcc51dc remove cannon pickup feature 2016-03-15 00:23:59 +00:00
Ben 3ae89e12a8 improve cannon UI 2016-03-15 00:21:37 +00:00
Ben c556d7b3c3 fix ConcurrentModificationException 2016-03-15 00:21:15 +00:00
Ben 864b12adbf make cannons explode chest items 2016-03-15 00:20:40 +00:00
Ben e08ba29ac1 Final fixing of cannon saving/loading 2016-03-14 22:48:31 +00:00
AlexTheCoder 3212b75e4e - Finally finished all of chiss' changes 2016-03-12 09:35:44 -05:00
Ben 422df69335 incognito async stuff and updated alpha holograms 2016-03-11 21:50:48 +00:00
Ben bdfb55d4e1 nevermind [revert leap change] 2016-03-11 21:22:01 +00:00
Ben bfdb7add2e run siege weapon queries async 2016-03-11 21:04:22 +00:00
Ben 1008c58e91 removed catapult code as it's very out of date at this point (and it's not being used hehe) 2016-03-11 19:33:02 +00:00
Ben eb0da6552c add C.cBlue to name of Outposts & Cannons. 2016-03-11 19:31:24 +00:00
Ben 523c194c56 Fix data values not being correct in shop page. 2016-03-11 19:31:05 +00:00
Ben d1c7879224 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-11 19:08:40 +00:00
Ben 45a0853564 remove test classes 2016-03-11 19:07:11 +00:00
Ben 86c50cc3cd updates 2016-03-11 19:03:32 +00:00
Shaun Bennett 1228ca227e Add support for 1.9 resource packs, Text Tutorials 2016-03-11 11:50:08 -06:00
Ben 2aa68d3e16 final stuff and map 2016-03-11 04:14:16 +00:00
Ben a27fb90c2a Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito 2016-03-11 02:21:03 +00:00
Ben 0e276474c5 fixerroooniissssss 2016-03-11 02:20:18 +00:00
Ben 01ba099d74 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito 2016-03-11 01:52:38 +00:00
Ben c9eb2c9559 Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito 2016-03-11 01:52:31 +00:00
Ben 57c65cf5ff some changes and vanish fixes maybe? 2016-03-11 01:47:14 +00:00
Ben 8ce32fcdfa little tweakers 2016-03-11 00:58:47 +00:00
Ben a568db6d90 remove eclipse file 2016-03-11 00:43:30 +00:00
Ben bcfe4a42c0 changerooonis 2016-03-11 00:41:28 +00:00
Ben 33d978c6d6 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-10 22:12:41 +00:00
Ben 20ade492a8 tnt generator changes 2016-03-10 22:09:45 +00:00
Shaun Bennett 76782fd420 Fix issues 2016-03-10 15:07:22 -06:00
Ben c2f6217d9f allowed sr. mods to use /we (TEMP) 2016-03-10 17:38:16 +00:00
Ben 0fd0a7fb44 mak esupply drop beacons more specific 2016-03-10 17:38:03 +00:00
git 557b0bf978 Fix Wither disguise 2016-03-11 01:55:49 +13:00
Ben 2d2e88e069 some fixes and updates 2016-03-10 02:47:48 +00:00
Ben 9b40496a1e siege weapon picking up 2016-03-09 23:56:25 +00:00
Joseph Prezioso Jr 4955abb519 Hopefully, ELO Rating will be grabbed from the correct column now... 2016-03-09 17:12:04 -05:00
Ben 1532abcc62 disable nether and legendary fixes 2016-03-09 21:12:02 +00:00
Ben 70aa5d63fd touched up on some messages 2016-03-09 13:10:39 +00:00
Ben 51e5552e2d Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-09 11:56:25 +00:00
Ben cf6645cec7 Legendaries and other preparation for beta 2016-03-09 11:55:40 +00:00
phobia e3fb40805c all siege items shouldn't be able to be placed or used while on PvP timer. 
Fixes to Jagged prefix
 2016-03-09 22:46:45 +11:00
Virizion 67e844db29 Added /e bridge <seconds> PC-17 2016-03-08 21:21:53 -05:00
Ben 5b3da3d06f Consistency. (Changed Vanish to Incognito) 2016-03-09 01:53:01 +00:00
Virizion 6c0d18662f Added /e clear <player or @a> PC-16 2016-03-08 20:45:23 -05:00
Ben befb27d3db Finalized Vanish system 2016-03-09 01:45:17 +00:00
Virizion c89669aec9 Add /e announce <text> PC-15 2016-03-08 20:23:33 -05:00
Virizion b1c8158e2f Added @a argument to /shard, /gem and /giveitem PC-13 2016-03-08 19:52:31 -05:00
Joseph Prezioso Jr 059b964f22 eloRating now after warLosses so that it matches better with the SQL table 2016-03-08 17:06:13 -05:00
Joseph Prezioso Jr 19375e5720 callEvent now has a return type 2016-03-08 16:20:53 -05:00
Joseph Prezioso Jr ac91ba690c Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-08 16:08:14 -05:00
Joseph Prezioso Jr b8f06374cd Made changes to accommodate for Clan ELO's 2016-03-08 16:07:52 -05:00
Ben abdf61de0a *more fixes* 2016-03-08 21:02:25 +00:00
Ben af8f0fff16 vanish error fixes 2016-03-08 21:00:19 +00:00
Ben 69091c079f Merge branch 'feature/incognito' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-08 20:58:11 +00:00
Shaun Bennett 9b65926d42 Fix rank monthly rewards description 2016-03-08 13:26:26 -06:00