Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
7e8ae207 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2019-07-11 21:45:34 -05:00
parent 02e31ae620
commit abd93908c7
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 8812fed9bb...7e8ae207bd

2
current-paper
View File

@@ -1 +1 @@
1.14.3--10d7502e7fcd7fd8d163ee56f034dc4a02ca3ef1
1.14.3--f1b76d14d7604a7ff528a5dbfada24040995bc78

10
patches/api/0012-Block-and-Fluid-Tick-Events.patch
View File

@@ -1,4 +1,4 @@
From 8272f3bf685efcdfa39f21e05ccfeac8560144d2 Mon Sep 17 00:00:00 2001
From da238cff8dd0f47ebd11b15dbfbd36fbecf25fe4 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 23:23:45 -0500
Subject: [PATCH] Block and Fluid Tick Events
@@ -13,7 +13,7 @@ Subject: [PATCH] Block and Fluid Tick Events
diff --git a/src/main/java/net/pl3x/purpur/event/block/BlockTickEvent.java b/src/main/java/net/pl3x/purpur/event/block/BlockTickEvent.java
new file mode 100644
index 00000000..e467052a
index 000000000..e467052a0
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/event/block/BlockTickEvent.java
@@ -0,0 +1,52 @@
@@ -71,7 +71,7 @@ index 00000000..e467052a
+}
diff --git a/src/main/java/net/pl3x/purpur/event/block/FluidTickEvent.java b/src/main/java/net/pl3x/purpur/event/block/FluidTickEvent.java
new file mode 100644
index 00000000..9cd1e3dd
index 000000000..9cd1e3dde
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/event/block/FluidTickEvent.java
@@ -0,0 +1,52 @@
@@ -128,10 +128,10 @@ index 00000000..9cd1e3dd
+ }
+}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 65dc8022..c99e4291 100644
index 1e7b633c1..8794160e6 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2811,6 +2811,36 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -2900,6 +2900,36 @@ public interface World extends PluginMessageRecipient, Metadatable {
@Nullable
public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored);

6
patches/server/0011-Integrate-ridables.patch
View File

@@ -1,4 +1,4 @@
From 902abbbaa4d70696b4632d176da085a41bdb4728 Mon Sep 17 00:00:00 2001
From da7579b21c43d655f722bc1d24bec3f76cc8d2d3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables
@@ -165,7 +165,7 @@ index 454627f65..df3d6cf28 100644
this.d = false;
this.a.aM = this.a(this.a.aM, this.h() + 20.0F, this.b);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index adfd6e855..cf5d829f6 100644
index 0ff92183f..01c8452bb 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -78,6 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -223,7 +223,7 @@ index adfd6e855..cf5d829f6 100644
this.passengers.remove(entity);
entity.j = 60;
}
@@ -3276,4 +3291,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3275,4 +3290,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void setMot(double d0, double d1, double d2) {
this.setMot(new Vec3D(d0, d1, d2));
}

8
patches/server/0030-Block-and-Fluid-Tick-Events.patch
View File

@@ -1,4 +1,4 @@
From 71b9cf6b4317a2d340e1a23eb4bc7fb5fcd3262b Mon Sep 17 00:00:00 2001
From 6126176f12b4e60b90fbf20a0e531a00f539dbf0 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 23:23:52 -0500
Subject: [PATCH] Block and Fluid Tick Events
@@ -46,7 +46,7 @@ index c646393eb..9fbfdb803 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a649a4c35..92eeaca42 100644
index 9dfba251e..775d40ab1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -106,4 +106,11 @@ public class PurpurWorldConfig {
@@ -62,10 +62,10 @@ index a649a4c35..92eeaca42 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 3e55033d3..748b817e9 100644
index ece1a68c1..85b5c2bff 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2210,6 +2210,24 @@ public class CraftWorld implements World {
@@ -2296,6 +2296,24 @@ public class CraftWorld implements World {
}
// Paper end