SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.15.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-01-22 08:00:00 +11:00
parent 09a2fa4d96
commit 77b64e0c78
50 changed files with 293 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
paper-server/nms-patches/PortalTravelAgent.patch
View File

@@ -1,11 +1,9 @@
--- a/net/minecraft/server/PortalTravelAgent.java
+++ b/net/minecraft/server/PortalTravelAgent.java
@@ -17,13 +17,20 @@
this.b = new Random(worldserver.getSeed());
@@ -18,12 +18,19 @@
}
- public boolean a(Entity entity, float f) {
+ public boolean a(Entity entity, float f) { // PAIL: rename to findAndTeleport
public boolean findAndTeleport(Entity entity, float f) {
+ // CraftBukkit start
+ return findAndTeleport(entity, new BlockPosition(entity), f, 128, false) != null;
+ }
@@ -27,7 +25,7 @@
@@ -31,19 +38,26 @@
entity.setMot(vec3d2);
entity.yaw = f + (float) shapedetector_shape.yaw;
entity.b(vec3d1.x, vec3d1.y, vec3d1.z);
entity.teleportAndSync(vec3d1.x, vec3d1.y, vec3d1.z);
- return true;
+ return shapedetector_shape; // CraftBukkit - return shape
}
@@ -61,14 +59,13 @@
return shapedetector_shapedetectorcollection.a(enumdirection, blockposition1, d1, vec3d, d0);
- }).orElse((Object) null);
+ }).orElse(null); // CraftBukkit - decompile error
+ }
+
+ public boolean a(Entity entity) { // PAIL: rename to createPortal
+ // CraftBukkit start - providable position and creation radius
+ return createPortal(entity, new BlockPosition(entity), 16);
}
- public boolean a(Entity entity) {
public boolean createPortal(Entity entity) {
+ // CraftBukkit start - providable position and creation radius
+ return createPortal(entity, new BlockPosition(entity), 16);
+ }
+
+ public boolean createPortal(Entity entity, BlockPosition createPosition, int createRadius) {
+ // CraftBukkit end
boolean flag = true;