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

6787 Commits

Author SHA1 Message Date
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
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
William Burns 4ec833727f PC-20 - Detailed Objective Text 2016-03-31 18:45:17 +01: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
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
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
William Burns 1d4472255f PC-40 - Add cooldown to Tutorial /c home 2016-03-29 18:50:28 +01: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
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
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
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
Shaun Bennett 7c06186a4f Fix cleanup and setup 2016-03-25 09:42:41 +11: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
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