EpicKnarvik97/Stargate
EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 7 Pull Requests Projects 1 Releases 27 Wiki Activity

Only gets vehicle exit world when it's actually used

Browse Source
This commit is contained in:
Kristian Knarvik 2021-09-16 21:31:32 +02:00
parent e253e95cec
commit 4851a0b5e2
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/net/knarcraft/stargate/portal/Portal.java
View File

@ -707,16 +707,16 @@ public class Portal {
adjustRotation(exit, origin);
List<Entity> passengers = vehicle.getPassengers();
World vehicleWorld = exit.getWorld();
if (vehicleWorld == null) {
Stargate.log.warning(Stargate.getString("prefix") + "Unable to get the world to teleport the vehicle to");
return;
}
loadChunks();
if (!passengers.isEmpty()) {
if (vehicle instanceof RideableMinecart || vehicle instanceof Boat) {
World vehicleWorld = exit.getWorld();
if (vehicleWorld == null) {
Stargate.log.warning(Stargate.getString("prefix") + "Unable to get the world to teleport the vehicle to");
return;
}
putPassengersInNewVehicle(vehicle, passengers, vehicleWorld, exit, newVelocity);
} else {
teleportLivingVehicle(vehicle, exit, passengers);
@ -914,11 +914,19 @@ public class Portal {
Chunk forwardChunk = fiveBlocksForward.getChunk();
//Load the chunks
if (!getWorld().isChunkLoaded(chunk)) {
chunk.load();
}
if (!getWorld().isChunkLoaded(forwardChunk)) {
forwardChunk.load();
loadOneChunk(chunk);
loadOneChunk(forwardChunk);
}
}
/**
* Loads one chunk
* @param chunk <p>The chunk to load</p>
*/
private void loadOneChunk(Chunk chunk) {
if (!getWorld().isChunkLoaded(chunk)) {
if (!chunk.load()) {
Stargate.debug("loadChunks", "Failed to load chunk " + chunk);
}
}
}