mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 07:23:43 +01:00
1e76d09fad
This also fixes that the nether/end portals would be created even if the event was cancelled as well as that the EntityPortalEvent would be called for player portal usage which is not according to its API specification
26 lines
912 B
Diff
26 lines
912 B
Diff
--- a/net/minecraft/server/ShapeDetectorShape.java
|
|
+++ b/net/minecraft/server/ShapeDetectorShape.java
|
|
@@ -1,13 +1,21 @@
|
|
package net.minecraft.server;
|
|
|
|
+import org.bukkit.craftbukkit.event.CraftPortalEvent; // CraftBukkit
|
|
+
|
|
public class ShapeDetectorShape {
|
|
|
|
public final Vec3D position;
|
|
public final Vec3D velocity;
|
|
public final float yaw;
|
|
public final float pitch;
|
|
+ // CraftBukkit start
|
|
+ public final WorldServer world;
|
|
+ public final CraftPortalEvent portalEventInfo;
|
|
|
|
- public ShapeDetectorShape(Vec3D vec3d, Vec3D vec3d1, float f, float f1) {
|
|
+ public ShapeDetectorShape(Vec3D vec3d, Vec3D vec3d1, float f, float f1, WorldServer world, CraftPortalEvent portalEventInfo) {
|
|
+ this.world = world;
|
|
+ this.portalEventInfo = portalEventInfo;
|
|
+ // CraftBukkit end
|
|
this.position = vec3d;
|
|
this.velocity = vec3d1;
|
|
this.yaw = f;
|