JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta

Browse Source 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java
This commit is contained in:
Ben 2016-03-25 01:30:46 +00:00
commit 87b1bf7dd0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java
View File

@ -239,7 +239,7 @@ public class ClansMainTutorial extends Tutorial
public void destroyFences(TutorialRegion region, DyeColor dataLoc)
{
List<Location> locations = region.getLocationMap().getIronLocations(dataLoc);
locations.stream().map(Location::getBlock).forEach(this::spawnFence);
locations.stream().map(Location::getBlock).forEach(this::destroyFence);
}
@EventHandler

5
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/StealEnemyPotatoesGoal.java
View File

@ -26,6 +26,8 @@ public class StealEnemyPotatoesGoal extends ObjectiveGoal<ClanObjective>
public StealEnemyPotatoesGoal(ClanObjective objective)
{
super(objective, "Steal Enemy Potatoes", "Steal the enemies potatoes");
_playersMap = new HashMap<>();
}
@Override
@ -38,6 +40,7 @@ public class StealEnemyPotatoesGoal extends ObjectiveGoal<ClanObjective>
@Override
protected void customStart(Player player)
{
_playersMap.put(player.getUniqueId(), new AtomicInteger(0));
UtilPlayer.message(player, F.main("Clans", "Now that you have blown a hole in the enemy's base, go and steal their potatoes."));
}
@ -55,7 +58,7 @@ public class StealEnemyPotatoesGoal extends ObjectiveGoal<ClanObjective>
System.out.println("b");
TutorialRegion region = getObjective().getPlugin().getRegion(event.getPlayer());
if (getObjective().getPlugin().isIn(event.getBlock().getLocation(), region, ClansMainTutorial.Bounds.ENEMY_LAND))
if (getObjective().getPlugin().isIn(event.getBlock().getLocation().add(0, 1, 0), region, ClansMainTutorial.Bounds.ENEMY_LAND))
{
System.out.println("c");
event.setCancelled(true);