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

Improves comments for Stargate events, and adds a new event for teleporting entities

Browse Source 
Adds information about what events can be used for
Tries to clarify event comments where possible
Renames The StargatePortalEvent to StargatePlayerPortalEvent
Adds StargateEntityPortalEvent
Makes the StargateEntityPortalEvent trigger whenever a vehicle is teleported
Removes the unused event name for all events
This commit is contained in:
Kristian Knarvik
2021-10-13 15:45:15 +02:00
parent 0ab6cb52c0
commit bf7a10636e
14 changed files with 223 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,8 +8,9 @@ import net.knarcraft.stargate.container.RelativeBlockVector;
import net.knarcraft.stargate.event.StargateActivateEvent;
import net.knarcraft.stargate.event.StargateCloseEvent;
import net.knarcraft.stargate.event.StargateDeactivateEvent;
import net.knarcraft.stargate.event.StargateEntityPortalEvent;
import net.knarcraft.stargate.event.StargateOpenEvent;
import net.knarcraft.stargate.event.StargatePortalEvent;
import net.knarcraft.stargate.event.StargatePlayerPortalEvent;
import net.knarcraft.stargate.utility.DirectionHelper;
import net.knarcraft.stargate.utility.EntityHelper;
import net.knarcraft.stargate.utility.SignHelper;
@ -486,17 +487,18 @@ public class Portal {
//Rotate the player to face out from the portal
adjustRotation(exit);
//Call the StargatePortalEvent to allow plugins to change destination
//Call the StargatePlayerPortalEvent to allow plugins to change destination
if (!origin.equals(this)) {
StargatePortalEvent stargatePortalEvent = new StargatePortalEvent(player, origin, this, exit);
Stargate.server.getPluginManager().callEvent(stargatePortalEvent);
StargatePlayerPortalEvent stargatePlayerPortalEvent = new StargatePlayerPortalEvent(player, origin,
this, exit);
Stargate.server.getPluginManager().callEvent(stargatePlayerPortalEvent);
//Teleport is cancelled. Teleport the player back to where it came from
if (stargatePortalEvent.isCancelled()) {
if (stargatePlayerPortalEvent.isCancelled()) {
origin.teleport(player, origin, event);
return;
}
//Update exit if needed
exit = stargatePortalEvent.getExit();
exit = stargatePlayerPortalEvent.getExit();
}
//Load chunks to make sure not to teleport to the void
@ -530,8 +532,9 @@ public class Portal {
* Teleports a vehicle to this portal
*
* @param vehicle <p>The vehicle to teleport</p>
* @param origin <p>The portal the vehicle teleports from</p>
*/
public void teleport(final Vehicle vehicle) {
public void teleport(final Vehicle vehicle, Portal origin) {
Location traveller = vehicle.getLocation();
Location exit = getExit(vehicle, traveller);
@ -547,6 +550,20 @@ public class Portal {
List<Entity> passengers = vehicle.getPassengers();
//Call the StargateEntityPortalEvent to allow plugins to change destination
if (!origin.equals(this)) {
StargateEntityPortalEvent stargateEntityPortalEvent = new StargateEntityPortalEvent(vehicle, origin,
this, exit);
Stargate.server.getPluginManager().callEvent(stargateEntityPortalEvent);
//Teleport is cancelled. Teleport the entity back to where it came from
if (stargateEntityPortalEvent.isCancelled()) {
origin.teleport(vehicle, origin);
return;
}
//Update exit if needed
exit = stargateEntityPortalEvent.getExit();
}
//Load chunks to make sure not to teleport to the void
loadChunks();