SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Aktivität

SPIGOT-7827: Sync EntityPortalEvent with PlayerPortalEvent since non-players can now create portals

Quellcode durchsuchen 
By: md_5 <git@md-5.net>
Dieser Commit ist enthalten in:
CraftBukkit/Spigot 2024-07-10 19:43:43 +10:00
Ursprung 4377eb6edb
Commit 71bc2b07ed
2 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
paper-server/nms-patches/net/minecraft/world/entity/Entity.patch
Datei anzeigen

@ -861,7 +861,7 @@
+ org.bukkit.entity.Entity bukkitEntity = entity.getBukkitEntity(); + org.bukkit.entity.Entity bukkitEntity = entity.getBukkitEntity();
+ Location enter = bukkitEntity.getLocation(); + Location enter = bukkitEntity.getLocation();
+ +
+ EntityPortalEvent event = new EntityPortalEvent(bukkitEntity, enter, exit, searchRadius); + EntityPortalEvent event = new EntityPortalEvent(bukkitEntity, enter, exit, searchRadius, true, creationRadius);
+ event.getEntity().getServer().getPluginManager().callEvent(event); + event.getEntity().getServer().getPluginManager().callEvent(event);
+ if (event.isCancelled() || event.getTo() == null || event.getTo().getWorld() == null || !entity.isAlive()) { + if (event.isCancelled() || event.getTo() == null || event.getTo().getWorld() == null || !entity.isAlive()) {
+ return null; + return null;

4
paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftPortalEvent.java
Datei anzeigen

@ -19,8 +19,8 @@ public class CraftPortalEvent {
to = portalEvent.getTo(); to = portalEvent.getTo();
searchRadius = portalEvent.getSearchRadius(); searchRadius = portalEvent.getSearchRadius();
cancelled = portalEvent.isCancelled(); cancelled = portalEvent.isCancelled();
creationRadius = 0; creationRadius = portalEvent.getCreationRadius();
canCreatePortal = false; canCreatePortal = portalEvent.getCanCreatePortal();
} }
public CraftPortalEvent(PlayerPortalEvent portalEvent) { public CraftPortalEvent(PlayerPortalEvent portalEvent) {