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

8327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Thanos paravantis
cc68b7087a Change wool color on Wave Crush challenge 
During map generation, the wool color is now predetermined and not
random.
 2016-04-03 17:15:20 +03:00
Thanos paravantis
18ff9c23f7 Modify block removal from Wave Crush challenge 
The removeExtraBlocks() method was changed, in order to include all
arena blocks. The previous version did not remove all extra blocks,
as it was using the getArenaSize() method inside the for-loop, which
returns a different integer depending on the challengers.

To fix that, I've implemented the '_arenaStartSize' field to store the
starting arena size value that is used in the map generation method.
 2016-04-03 16:53:14 +03:00
Thanos paravantis
114fac2655 Refactor Red Light Green Light challenge 
Separated functionality into different methods in order to improve
readability and maintainability. All four abstract methods were
updated, in order to make sure they work as intended without any
second thoughts.

Moreover, a PlayerQuitEvent listener was added to remove players from
the '_cooldown' array list and a null check in the onEnd method, to
prevent any null pointer exceptions.

Also, there were some minor display changes, regarding titles and chat
messages on the moveTextAndSound() and cannotMoveTextAndSound() methods.

Lastly, the bedrock layer was removed from map generation.
 2016-04-03 16:49:31 +03: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
Thanos paravantis
f454a6de81 Comment game classes and remove unnecessary checks 
Added comments on game classes, except challenges
and statistics trackers.

Removed challenge validity checks from onCollide method in Anvil Dance
and Falling Blocks, since that is now handled on the Collide method
located in the main game class.
 2016-04-02 22:49:56 +03:00