Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
e5c1ad1f3a | |||
cab99e11b0 | |||
3c4d10ae3f | |||
aff0082906 | |||
20c3c93c06 | |||
dab9378a67 | |||
b8d98c26d4 | |||
8bb9c464d6 | |||
2b5d791581 |
19
README.md
19
README.md
@ -10,6 +10,7 @@ can share a network or be split into clusters; they can be hidden on a network o
|
||||
- Multiple built-in languages (de, en, es, fr, hu, it, nb-no, nl, nn-no, pt-br, ru)
|
||||
- Teleport across worlds or servers (BungeeCord supported)
|
||||
- Vehicle teleportation -- teleport minecarts, boats, horses, pigs and striders
|
||||
- Leashed teleportation -- teleport any creature in a leash with the player
|
||||
- Underwater portals -- portals can be placed underwater as long as a waterproof button is used
|
||||
- API available -- using the API, a lot of behavior can be changed
|
||||
- Button customization -- a large amount of materials usable as buttons (buttons, wall corals, shulkers, chests)
|
||||
@ -301,6 +302,10 @@ gates:
|
||||
functionality:
|
||||
enableBungee - Enable this for BungeeCord support. This allows portals across Bungee servers.
|
||||
handleVehicles - Whether or not to handle vehicles going through gates. Set to false to disallow vehicles (Manned or not) going through gates.
|
||||
handleEmptyVehicles - Whether or not to handle empty vehicles going through gates (chest/hopper/tnt/furnace minecarts included).
|
||||
handleCreatureTransportation - Whether or not to handle players that transport creatures by sending vehicles (minecarts, boats) through gates.
|
||||
handleNonPlayerVehicles - Whether or not to handle vehicles with a passenger which is not a player going through gates (pigs, horses, villagers, creepers, etc.). handleCreatureTransportation must be enabled.
|
||||
handleLeashedCreatures - Whether or not to handle creatures leashed by a player going through gates. Set to false to disallow leashed creatures going through gates.
|
||||
economy:
|
||||
useEconomy - Whether or not to enable Economy using Vault (must have the Vault plugin)
|
||||
createCost - The cost to create a stargate
|
||||
@ -367,6 +372,20 @@ bungeeSign=Teleport to
|
||||
|
||||
# Changes
|
||||
|
||||
#### \[Version 0.9.0.5] EpicKnarvik97 fork
|
||||
|
||||
- Adds an option to stargate functionality to disable all teleportation of creatures
|
||||
- Adds an option to stargate functionality to disable all teleportation of empty minecarts
|
||||
- Adds an option to stargate functionality to disable teleportation of creatures if no player is present in the vehicle
|
||||
- Prevents a player in a vehicle from teleporting without the vehicle if vehicle teleportation is disabled
|
||||
- Prevents an infinite number of teleportation messages if vehicle teleportation is detected but denied
|
||||
|
||||
#### \[Version 0.9.0.4] EpicKnarvik97 fork
|
||||
|
||||
- Adds teleportation of leashed creatures. By default, any creature connected to a player by a lead will be teleported
|
||||
with the player through stargates, even if the player is in a vehicle. This behavior can be disabled in the config
|
||||
file.
|
||||
|
||||
#### \[Version 0.9.0.3] EpicKnarvik97 fork
|
||||
|
||||
- Adds a missing error message when a player in a vehicle cannot pay the teleportation fee
|
||||
|
2
pom.xml
2
pom.xml
@ -4,7 +4,7 @@
|
||||
|
||||
<groupId>net.knarcraft</groupId>
|
||||
<artifactId>Stargate</artifactId>
|
||||
<version>0.9.0.3</version>
|
||||
<version>0.9.0.5</version>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
|
@ -13,6 +13,10 @@ public final class StargateGateConfig {
|
||||
private int maxGatesEachNetwork = 0;
|
||||
private boolean rememberDestination = false;
|
||||
private boolean handleVehicles = true;
|
||||
private boolean handleEmptyVehicles = true;
|
||||
private boolean handleCreatureTransportation = true;
|
||||
private boolean handleNonPlayerVehicles = true;
|
||||
private boolean handleLeashedCreatures = true;
|
||||
private boolean sortNetworkDestinations = false;
|
||||
private boolean protectEntrance = false;
|
||||
private boolean enableBungee = true;
|
||||
@ -76,6 +80,56 @@ public final class StargateGateConfig {
|
||||
return handleVehicles;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets whether vehicles with no passengers should be handled
|
||||
*
|
||||
* <p>The handle vehicles option overrides this option if disabled. This option allows empty passenger
|
||||
* minecarts/boats, but also chest/tnt/hopper/furnace minecarts to teleport through stargates.</p>
|
||||
*
|
||||
* @return <p>Whether vehicles without passengers should be handled</p>
|
||||
*/
|
||||
public boolean handleEmptyVehicles() {
|
||||
return handleEmptyVehicles;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets whether vehicles containing creatures should be handled
|
||||
*
|
||||
* <p>The handle vehicles option overrides this option if disabled. This option allows creatures (pigs, pandas,
|
||||
* zombies, etc.) to teleport through stargates if in a vehicle.</p>
|
||||
*
|
||||
* @return <p>Whether vehicles with creatures should be handled</p>
|
||||
*/
|
||||
public boolean handleCreatureTransportation() {
|
||||
return handleCreatureTransportation;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets whether vehicles containing a creature, but not a player should be handled
|
||||
*
|
||||
* <p>The handle vehicles option, and the handle creature transportation option, override this option if disabled.
|
||||
* This option allows creatures (pigs, pandas, zombies, etc.) to teleport through stargates if in a vehicle, even
|
||||
* if no player is in the vehicle.
|
||||
* As it is not possible to check if a creature is allowed through a stargate, they will be able to go through
|
||||
* regardless of whether the initiating player is allowed to enter the stargate. Enabling this is necessary to
|
||||
* teleport creatures using minecarts, but only handleCreatureTransportation is required to teleport creatures
|
||||
* using a boat manned by a player.</p>
|
||||
*
|
||||
* @return <p>Whether non-empty vehicles without a player should be handled</p>
|
||||
*/
|
||||
public boolean handleNonPlayerVehicles() {
|
||||
return handleNonPlayerVehicles;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets whether leashed creatures should be teleported with a teleporting player
|
||||
*
|
||||
* @return <p>Whether leashed creatures should be handled</p>
|
||||
*/
|
||||
public boolean handleLeashedCreatures() {
|
||||
return handleLeashedCreatures;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets whether the list of destinations within a network should be sorted
|
||||
*
|
||||
@ -142,6 +196,10 @@ public final class StargateGateConfig {
|
||||
|
||||
//Functionality
|
||||
handleVehicles = newConfig.getBoolean("gates.functionality.handleVehicles");
|
||||
handleEmptyVehicles = newConfig.getBoolean("gates.functionality.handleEmptyVehicles");
|
||||
handleCreatureTransportation = newConfig.getBoolean("gates.functionality.handleCreatureTransportation");
|
||||
handleNonPlayerVehicles = newConfig.getBoolean("gates.functionality.handleNonPlayerVehicles");
|
||||
handleLeashedCreatures = newConfig.getBoolean("gates.functionality.handleLeashedCreatures");
|
||||
enableBungee = newConfig.getBoolean("gates.functionality.enableBungee");
|
||||
|
||||
//Integrity
|
||||
@ -173,5 +231,4 @@ public final class StargateGateConfig {
|
||||
Stargate.logWarning("You have specified an invalid color in your config.yml. Defaulting to BLACK and WHITE");
|
||||
PortalSignDrawer.setColors(ChatColor.BLACK, ChatColor.WHITE);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -90,7 +90,8 @@ public class PlayerEventListener implements Listener {
|
||||
|
||||
Entity playerVehicle = player.getVehicle();
|
||||
//If the player is in a vehicle, but vehicle handling is disabled, just ignore the player
|
||||
if (playerVehicle == null || Stargate.getGateConfig().handleVehicles()) {
|
||||
if (playerVehicle == null || (playerVehicle instanceof LivingEntity &&
|
||||
Stargate.getGateConfig().handleVehicles())) {
|
||||
teleportPlayer(playerVehicle, player, entrancePortal, destination, event);
|
||||
}
|
||||
}
|
||||
|
@ -115,9 +115,12 @@ public class VehicleEventListener implements Listener {
|
||||
}
|
||||
}
|
||||
|
||||
Stargate.getMessageSender().sendSuccessMessage(player, Stargate.getString("teleportMsg"));
|
||||
new VehicleTeleporter(destinationPortal, vehicle).teleport(entrancePortal);
|
||||
entrancePortal.getPortalOpener().closePortal(false);
|
||||
//Teleport the vehicle and inform the user if the vehicle was teleported
|
||||
boolean teleported = new VehicleTeleporter(destinationPortal, vehicle).teleport(entrancePortal);
|
||||
if (teleported) {
|
||||
Stargate.getMessageSender().sendSuccessMessage(player, Stargate.getString("teleportMsg"));
|
||||
entrancePortal.getPortalOpener().closePortal(false);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -0,0 +1,71 @@
|
||||
package net.knarcraft.stargate.portal;
|
||||
|
||||
import net.knarcraft.stargate.Stargate;
|
||||
import net.knarcraft.stargate.event.StargateEntityPortalEvent;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.entity.Entity;
|
||||
|
||||
/**
|
||||
* The portal teleporter takes care of the actual portal teleportation for any entities
|
||||
*/
|
||||
public class EntityTeleporter extends Teleporter {
|
||||
|
||||
private final Entity teleportingEntity;
|
||||
|
||||
/**
|
||||
* Instantiates a new portal teleporter
|
||||
*
|
||||
* @param portal <p>The portal which is the target of the teleportation</p>
|
||||
*/
|
||||
public EntityTeleporter(Portal portal, Entity teleportingEntity) {
|
||||
super(portal);
|
||||
this.teleportingEntity = teleportingEntity;
|
||||
}
|
||||
|
||||
/**
|
||||
* Teleports an entity to this teleporter's portal
|
||||
*
|
||||
* @param origin <p>The portal the entity is teleporting from</p>
|
||||
* @return <p>True if the entity was teleported. False otherwise</p>
|
||||
*/
|
||||
public boolean teleport(Portal origin) {
|
||||
Location traveller = teleportingEntity.getLocation();
|
||||
Location exit = getExit(teleportingEntity, traveller);
|
||||
|
||||
//Rotate the entity to face out from the portal
|
||||
adjustRotation(exit);
|
||||
|
||||
//Call the StargateEntityPortalEvent to allow plugins to change destination
|
||||
if (!origin.equals(portal)) {
|
||||
exit = triggerEntityPortalEvent(origin, exit);
|
||||
if (exit == null) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
//Load chunks to make sure not to teleport to the void
|
||||
loadChunks();
|
||||
|
||||
teleportingEntity.teleport(exit);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers the entity portal event to allow plugins to change the exit location
|
||||
*
|
||||
* @param origin <p>The origin portal teleported from</p>
|
||||
* @param exit <p>The exit location to teleport the entity to</p>
|
||||
* @return <p>The location the entity should be teleported to, or null if the event was cancelled</p>
|
||||
*/
|
||||
protected Location triggerEntityPortalEvent(Portal origin, Location exit) {
|
||||
StargateEntityPortalEvent stargateEntityPortalEvent = new StargateEntityPortalEvent(teleportingEntity, origin,
|
||||
portal, exit);
|
||||
Stargate.getInstance().getServer().getPluginManager().callEvent(stargateEntityPortalEvent);
|
||||
//Teleport is cancelled. Teleport the entity back to where it came from just for sanity's sake
|
||||
if (stargateEntityPortalEvent.isCancelled()) {
|
||||
new EntityTeleporter(origin, teleportingEntity).teleport(origin);
|
||||
return null;
|
||||
}
|
||||
return stargateEntityPortalEvent.getExit();
|
||||
}
|
||||
}
|
@ -48,6 +48,9 @@ public class PlayerTeleporter extends Teleporter {
|
||||
//Load chunks to make sure not to teleport to the void
|
||||
loadChunks();
|
||||
|
||||
//Teleport any creatures leashed by the player in a 15-block range
|
||||
teleportLeashedCreatures(player, origin);
|
||||
|
||||
//If no event is passed in, assume it's a teleport, and act as such
|
||||
if (event == null) {
|
||||
player.teleport(exit);
|
||||
|
@ -13,7 +13,9 @@ import org.bukkit.block.data.Bisected;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
import org.bukkit.block.data.type.Slab;
|
||||
import org.bukkit.entity.AbstractHorse;
|
||||
import org.bukkit.entity.Creature;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.scheduler.BukkitScheduler;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@ -247,4 +249,47 @@ public abstract class Teleporter {
|
||||
return chunksToLoad;
|
||||
}
|
||||
|
||||
/**
|
||||
* Teleports any creatures leashed by the player
|
||||
*
|
||||
* @param player <p>The player which is teleported</p>
|
||||
* @param origin <p>The portal the player is teleporting from</p>
|
||||
*/
|
||||
protected void teleportLeashedCreatures(Player player, Portal origin) {
|
||||
//If this feature is disabled, just return
|
||||
if (!Stargate.getGateConfig().handleLeashedCreatures()) {
|
||||
return;
|
||||
}
|
||||
|
||||
//Find any nearby leashed entities to teleport with the player
|
||||
List<Creature> nearbyEntities = getLeashedCreatures(player);
|
||||
//Teleport all creatures leashed by the player to the portal the player is to exit from
|
||||
for (Creature creature : nearbyEntities) {
|
||||
creature.setLeashHolder(null);
|
||||
scheduler.scheduleSyncDelayedTask(Stargate.getInstance(), () -> {
|
||||
new EntityTeleporter(portal, creature).teleport(origin);
|
||||
scheduler.scheduleSyncDelayedTask(Stargate.getInstance(), () -> creature.setLeashHolder(player), 3);
|
||||
}, 2);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets all creatures leashed by a player within the given range
|
||||
*
|
||||
* @param player <p>The player to check</p>
|
||||
* @return <p>A list of all creatures the player is holding in a leash (lead)</p>
|
||||
*/
|
||||
protected List<Creature> getLeashedCreatures(Player player) {
|
||||
List<Creature> leashedCreatures = new ArrayList<>();
|
||||
//Find any nearby leashed entities to teleport with the player
|
||||
List<Entity> nearbyEntities = player.getNearbyEntities(15, 15, 15);
|
||||
//Teleport all creatures leashed by the player to the portal the player is to exit from
|
||||
for (Entity entity : nearbyEntities) {
|
||||
if (entity instanceof Creature creature && creature.isLeashed() && creature.getLeashHolder() == player) {
|
||||
leashedCreatures.add(creature);
|
||||
}
|
||||
}
|
||||
return leashedCreatures;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1,12 +1,13 @@
|
||||
package net.knarcraft.stargate.portal;
|
||||
|
||||
import net.knarcraft.stargate.Stargate;
|
||||
import net.knarcraft.stargate.event.StargateEntityPortalEvent;
|
||||
import net.knarcraft.stargate.config.StargateGateConfig;
|
||||
import net.knarcraft.stargate.utility.DirectionHelper;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.entity.Entity;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.entity.Vehicle;
|
||||
import org.bukkit.util.Vector;
|
||||
|
||||
@ -15,7 +16,7 @@ import java.util.List;
|
||||
/**
|
||||
* The portal teleporter takes care of the actual portal teleportation for any vehicles
|
||||
*/
|
||||
public class VehicleTeleporter extends Teleporter {
|
||||
public class VehicleTeleporter extends EntityTeleporter {
|
||||
|
||||
private final Vehicle teleportingVehicle;
|
||||
|
||||
@ -26,7 +27,7 @@ public class VehicleTeleporter extends Teleporter {
|
||||
* @param teleportingVehicle <p>The teleporting vehicle</p>
|
||||
*/
|
||||
public VehicleTeleporter(Portal portal, Vehicle teleportingVehicle) {
|
||||
super(portal);
|
||||
super(portal, teleportingVehicle);
|
||||
this.teleportingVehicle = teleportingVehicle;
|
||||
}
|
||||
|
||||
@ -36,9 +37,11 @@ public class VehicleTeleporter extends Teleporter {
|
||||
* <p>It is assumed that if a vehicle contains any players, their permissions have already been validated before
|
||||
* calling this method.</p>
|
||||
*
|
||||
* @param origin <p>The portal the vehicle teleports from</p>
|
||||
* @param origin <p>The portal the vehicle is teleporting from</p>
|
||||
* @return <p>True if the vehicle was teleported. False otherwise</p>
|
||||
*/
|
||||
public void teleport(Portal origin) {
|
||||
@Override
|
||||
public boolean teleport(Portal origin) {
|
||||
Location traveller = teleportingVehicle.getLocation();
|
||||
Location exit = getExit(teleportingVehicle, traveller);
|
||||
|
||||
@ -58,12 +61,12 @@ public class VehicleTeleporter extends Teleporter {
|
||||
if (!origin.equals(portal)) {
|
||||
exit = triggerEntityPortalEvent(origin, exit);
|
||||
if (exit == null) {
|
||||
return;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
//Teleport the vehicle
|
||||
teleportVehicle(exit, newVelocity);
|
||||
return teleportVehicle(exit, newVelocity, origin);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -71,45 +74,84 @@ public class VehicleTeleporter extends Teleporter {
|
||||
*
|
||||
* @param exit <p>The location the vehicle should be teleported to</p>
|
||||
* @param newVelocity <p>The velocity to give the vehicle right after teleportation</p>
|
||||
* @param origin <p>The portal the vehicle teleported from</p>
|
||||
* @return <p>True if the vehicle was teleported. False otherwise</p>
|
||||
*/
|
||||
private void teleportVehicle(Location exit, Vector newVelocity) {
|
||||
private boolean teleportVehicle(Location exit, Vector newVelocity, Portal origin) {
|
||||
//Load chunks to make sure not to teleport to the void
|
||||
loadChunks();
|
||||
|
||||
List<Entity> passengers = teleportingVehicle.getPassengers();
|
||||
if (!passengers.isEmpty()) {
|
||||
//Check if the passengers are allowed according to current config settings
|
||||
if (!vehiclePassengersAllowed(passengers)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!(teleportingVehicle instanceof LivingEntity)) {
|
||||
//Teleport a normal vehicle with passengers (minecart or boat)
|
||||
putPassengersInNewVehicle(passengers, exit, newVelocity);
|
||||
putPassengersInNewVehicle(passengers, exit, newVelocity, origin);
|
||||
} else {
|
||||
//Teleport a living vehicle with passengers (pig, horse, donkey, strider)
|
||||
teleportLivingVehicle(exit, passengers);
|
||||
teleportLivingVehicle(exit, passengers, origin);
|
||||
}
|
||||
} else {
|
||||
//Check if teleportation of empty vehicles is enabled
|
||||
if (!Stargate.getGateConfig().handleEmptyVehicles()) {
|
||||
return false;
|
||||
}
|
||||
//Teleport an empty vehicle
|
||||
teleportingVehicle.teleport(exit);
|
||||
scheduler.scheduleSyncDelayedTask(Stargate.getInstance(),
|
||||
() -> teleportingVehicle.setVelocity(newVelocity), 1);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers the entity portal event to allow plugins to change the exit location
|
||||
* Checks whether current config values allow the teleportation of the given passengers
|
||||
*
|
||||
* @param origin <p>The origin portal teleported from</p>
|
||||
* @param exit <p>The exit location to teleport the vehicle to</p>
|
||||
* @return <p>The location the vehicle should be teleported to, or null if the event was cancelled</p>
|
||||
* @param passengers <p>The passengers to teleport</p>
|
||||
* @return <p>True if the passengers are allowed to teleport</p>
|
||||
*/
|
||||
private Location triggerEntityPortalEvent(Portal origin, Location exit) {
|
||||
StargateEntityPortalEvent stargateEntityPortalEvent = new StargateEntityPortalEvent(teleportingVehicle, origin,
|
||||
portal, exit);
|
||||
Stargate.getInstance().getServer().getPluginManager().callEvent(stargateEntityPortalEvent);
|
||||
//Teleport is cancelled. Teleport the entity back to where it came from just for sanity's sake
|
||||
if (stargateEntityPortalEvent.isCancelled()) {
|
||||
new VehicleTeleporter(origin, teleportingVehicle).teleport(origin);
|
||||
return null;
|
||||
private boolean vehiclePassengersAllowed(List<Entity> passengers) {
|
||||
StargateGateConfig config = Stargate.getGateConfig();
|
||||
//Don't teleport if the vehicle contains a creature and creature transportation is disabled
|
||||
if (containsNonPlayer(passengers) && !config.handleCreatureTransportation()) {
|
||||
return false;
|
||||
}
|
||||
return stargateEntityPortalEvent.getExit();
|
||||
//Don't teleport if the player does not contain a player and non-player vehicles is disabled
|
||||
return containsPlayer(passengers) || config.handleNonPlayerVehicles();
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks whether a list of entities contains any non-players
|
||||
*
|
||||
* @param entities <p>The list of entities to check</p>
|
||||
* @return <p>True if at least one entity is not a player</p>
|
||||
*/
|
||||
private boolean containsNonPlayer(List<Entity> entities) {
|
||||
for (Entity entity : entities) {
|
||||
if (!(entity instanceof Player)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks whether a list of entities contains at least one player
|
||||
*
|
||||
* @param entities <p>The list of entities to check</p>
|
||||
* @return <p>True if at least one player is present among the passengers</p>
|
||||
*/
|
||||
private boolean containsPlayer(List<Entity> entities) {
|
||||
for (Entity entity : entities) {
|
||||
if (entity instanceof Player) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -117,11 +159,12 @@ public class VehicleTeleporter extends Teleporter {
|
||||
*
|
||||
* @param exit <p>The location the vehicle will exit</p>
|
||||
* @param passengers <p>The passengers of the vehicle</p>
|
||||
* @param origin <p>The portal the vehicle teleported from</p>
|
||||
*/
|
||||
private void teleportLivingVehicle(Location exit, List<Entity> passengers) {
|
||||
private void teleportLivingVehicle(Location exit, List<Entity> passengers, Portal origin) {
|
||||
teleportingVehicle.eject();
|
||||
teleportingVehicle.teleport(exit);
|
||||
handleVehiclePassengers(passengers, teleportingVehicle, 2);
|
||||
handleVehiclePassengers(passengers, teleportingVehicle, 2, origin);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -134,9 +177,10 @@ public class VehicleTeleporter extends Teleporter {
|
||||
* @param passengers <p>A list of all passengers in the vehicle</p>
|
||||
* @param exit <p>The exit location to spawn the new vehicle on</p>
|
||||
* @param newVelocity <p>The new velocity of the new vehicle</p>
|
||||
* @param origin <p>The portal the vehicle teleported from</p>
|
||||
*/
|
||||
private void putPassengersInNewVehicle(List<Entity> passengers, Location exit,
|
||||
Vector newVelocity) {
|
||||
Vector newVelocity, Portal origin) {
|
||||
World vehicleWorld = exit.getWorld();
|
||||
if (vehicleWorld == null) {
|
||||
Stargate.logWarning("Unable to get the world to teleport the vehicle to");
|
||||
@ -149,7 +193,7 @@ public class VehicleTeleporter extends Teleporter {
|
||||
teleportingVehicle.remove();
|
||||
//Set rotation, add passengers and restore velocity
|
||||
newVehicle.setRotation(exit.getYaw(), exit.getPitch());
|
||||
handleVehiclePassengers(passengers, newVehicle, 1);
|
||||
handleVehiclePassengers(passengers, newVehicle, 1, origin);
|
||||
scheduler.scheduleSyncDelayedTask(Stargate.getInstance(), () -> newVehicle.setVelocity(newVelocity), 1);
|
||||
}
|
||||
|
||||
@ -159,12 +203,18 @@ public class VehicleTeleporter extends Teleporter {
|
||||
* @param passengers <p>The passengers to handle</p>
|
||||
* @param vehicle <p>The vehicle the passengers should be put into</p>
|
||||
* @param delay <p>The amount of milliseconds to wait before adding the vehicle passengers</p>
|
||||
* @param origin <p>The portal the vehicle teleported from</p>
|
||||
*/
|
||||
private void handleVehiclePassengers(List<Entity> passengers, Vehicle vehicle, long delay) {
|
||||
private void handleVehiclePassengers(List<Entity> passengers, Vehicle vehicle, long delay, Portal origin) {
|
||||
for (Entity passenger : passengers) {
|
||||
passenger.eject();
|
||||
scheduler.scheduleSyncDelayedTask(Stargate.getInstance(), () -> teleportAndAddPassenger(vehicle, passenger),
|
||||
delay);
|
||||
scheduler.scheduleSyncDelayedTask(Stargate.getInstance(), () -> {
|
||||
if (passenger instanceof Player player) {
|
||||
//Teleport any creatures leashed by the player in a 15-block range
|
||||
teleportLeashedCreatures(player, origin);
|
||||
}
|
||||
teleportAndAddPassenger(vehicle, passenger);
|
||||
}, delay);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -8,7 +8,11 @@
|
||||
# maxGatesEachNetwork - The maximum number of gates allowed on a network - 0 for unlimited
|
||||
# language - The language file to load for messages
|
||||
# rememberDestination - Whether to remember the cursor location between uses
|
||||
# handleVehicles - Whether to allow vehicles through gates
|
||||
# handleVehicles - Whether to allow vehicles through gates. This overrides other vehicle settings
|
||||
# handleEmptyVehicles - Whether to allow empty vehicles through gates (chest/hopper/tnt/furnace minecarts included)
|
||||
# handleCreatureTransportation - Whether to allow players to transport creatures by sending vehicles (minecarts, boats) through gates
|
||||
# handleNonPlayerVehicles - Whether to allow vehicles with a passenger which is not a player through gates. handleCreatureTransportation must be enabled
|
||||
# handleLeashedCreatures - Whether to allow creatures lead by a player to teleport with the player
|
||||
# sortNetworkDestinations - Whether to sort network lists alphabetically
|
||||
# protectEntrance - Whether to protect gate entrance material (More resource intensive. Only enable if using destroyable open/closed material)
|
||||
# mainSignColor - The color used for drawing signs (Default: BLACK).
|
||||
@ -49,6 +53,10 @@ gates:
|
||||
functionality:
|
||||
enableBungee: false
|
||||
handleVehicles: true
|
||||
handleEmptyVehicles: true
|
||||
handleCreatureTransportation: true
|
||||
handleNonPlayerVehicles: true
|
||||
handleLeashedCreatures: true
|
||||
economy:
|
||||
useEconomy: false
|
||||
createCost: 0
|
||||
|
@ -1,6 +1,6 @@
|
||||
name: Stargate
|
||||
main: net.knarcraft.stargate.Stargate
|
||||
version: 0.9.0.3
|
||||
version: 0.9.0.5
|
||||
description: Stargate mod for Bukkit Revived
|
||||
author: EpicKnarvik97
|
||||
authors: [ Drakia, PseudoKnight, EpicKnarvik97 ]
|
||||
|
Reference in New Issue
Block a user