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

Add fix for new game lobbies

This commit is contained in:
Sarah 2017-06-02 03:41:06 +02:00
parent 4b54232514
commit 73897e407b
7 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
View File

@ -1261,4 +1261,9 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
{
_carlLocation = carlLocation;
}
public Npc getCarl()
{
return _carlNpc;
}
}

7
Plugins/Mineplex.Core/src/mineplex/core/quests/QuestManager.java
View File

@ -11,6 +11,7 @@ import java.util.function.Consumer;
import net.md_5.bungee.api.ChatColor;
import org.apache.commons.lang3.tuple.Triple;
import org.bukkit.Location;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Slime;
@ -78,7 +79,7 @@ public class QuestManager extends MiniClientPlugin<QuestClientData>
private HologramManager _hologramManager;
private boolean _visualTick;
public QuestManager(HologramManager hologramManager, InventoryManager inventoryManager, DonationManager donationManager)
public QuestManager(HologramManager hologramManager, Location npc, InventoryManager inventoryManager, DonationManager donationManager)
{
super("Quest Manager");
@ -101,6 +102,10 @@ public class QuestManager extends MiniClientPlugin<QuestClientData>
{
Slime slime = (Slime) _questNPC.getEntity();
slime.setSize(3);
if (npc != null)
{
_questNPC.setLocation(npc);
}
_enableNPC = true;
}
}

2
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

@ -294,7 +294,7 @@ public class HubManager extends MiniClientPlugin<HubClient> implements IChatMess
new EasterEggHunt(plugin, _clientManager);
_questManager = new QuestManager(hologramManager, _inventoryManager, _donationManager);
_questManager = new QuestManager(hologramManager, null, _inventoryManager, _donationManager);
new TemporaryGemHuntersServerSender(_portal);

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
View File

@ -391,7 +391,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
_kitProgressionManager = new KitProgressionManager(getPlugin(), donationManager, clientManager);
_progressionKitManager = new ProgressingKitManager(this);
_serverUptimeManager = new ServerUptimeManager(this);
_questManager = new QuestManager(hologramManager, _inventoryManager, _donationManager);
_questManager = new QuestManager(hologramManager, _gameLobbyManager.getMissions(), _inventoryManager, _donationManager);
if (GetHost() != null && !GetHost().isEmpty() && !GetHost().startsWith("COM-"))
{

13
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/lobby/LobbyManager.java
View File

@ -83,12 +83,13 @@ public abstract class LobbyManager implements Listener
private Location _kitText;
private Location _teamText;
private Location _carl;
private Location _missions;
private Location _spawn;
private Location _ampStand;
private boolean _colorTick = false;
private boolean _generatePodiums = false;
public LobbyManager(ArcadeManager manager, Location carl, Location spawn, Location ampStand)
public LobbyManager(ArcadeManager manager, Location missions, Location carl, Location spawn, Location ampStand)
{
_manager = manager;
@ -892,4 +893,14 @@ public abstract class LobbyManager implements Listener
{
return _generatePodiums;
}
public Location getMissions()
{
return _missions;
}
public void setMissions(Location loc)
{
_missions = loc;
}
}

15
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/lobby/current/NewGameLobbyManager.java
View File

@ -58,6 +58,7 @@ public class NewGameLobbyManager extends LobbyManager
public enum DataLoc
{
CARL,
MISSIONS,
AMP,
SPAWN,;
}
@ -70,7 +71,7 @@ public class NewGameLobbyManager extends LobbyManager
public NewGameLobbyManager(ArcadeManager manager)
{
super(manager, null, null, null);
super(manager, null, null, null, null);
_run = CONFIG.exists();
if (_run)
@ -519,7 +520,7 @@ public class NewGameLobbyManager extends LobbyManager
continue;
}
if (!lastName.equalsIgnoreCase("SPAWN") || lastName.equalsIgnoreCase("CARL"))
if (!lastName.equalsIgnoreCase("SPAWN") || lastName.equalsIgnoreCase("CARL") || lastName.equalsIgnoreCase("MISSIONS"))
{
loc.subtract(0, 0.5, 0);
}
@ -557,6 +558,16 @@ public class NewGameLobbyManager extends LobbyManager
setCarl(carl);
}
Location missions = _singleLocs.get(DataLoc.MISSIONS.name());
if (missions != null)
{
missions.add(0, 0.5, 0);
float yaw = UtilAlg.GetYaw(UtilAlg.getTrajectory2d(missions, getSpawn()));
missions.setYaw(yaw);
setMissions(missions);
}
Location amp = _singleLocs.get(DataLoc.AMP.name());
if (amp != null)

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/lobby/legacy/LegacyGameLobbyManager.java
View File

@ -39,7 +39,7 @@ public class LegacyGameLobbyManager extends LobbyManager
public LegacyGameLobbyManager(ArcadeManager manager)
{
super(manager, null, null, new Location(UtilWorld.getWorld("world"), 0, 102.5, -15));
super(manager, null, null, null, new Location(UtilWorld.getWorld("world"), 0, 102.5, -15));
setSpawn(new Location(WORLD, 0, 104, 0, 0, 0));