Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07: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:
cc477e6a Force Plugins that use delayed tasks for init back in their place
597263fd Don't skip full player connection tick when dead
e2c23475 Revert loaded entity list (#3304)
fa87db6b Move another NetworkManager util into the inner class (#3303)
841c7d18 Make loaded entity list logic more consistent (#3301)
36f34f01 Updated Upstream (Bukkit/CraftBukkit)
5ca5f131 Rebuild all patches using the new rebuild pattern
1ccff6fa Add villager reputation API
5c0bfffa Speed up rebuilding patches and reduce diff
f37381ea Optimize Network Manager to not need synchronization
8f9df2ed Anti Xray cleanup
878c66f1 No-Tick view distance implementation - Closes #3196
b87743c1 Stop copy-on-write operations for updating light data
97a9c972 Optimize isOutsideRange to use distance maps
b4e629a2 Use distance map to optimise entity tracker / Misc Utils
d80d1517 Optimize Entity Ticking to Loaded Chunks only
31d7686d Add item slot helper methods for various inventories (#3221)
75e1e3b3 Mob Goal API
c7bc393a Revert "Don't flush packet queue off main thread"
1abd2bd2 Don't flush packet queue off main thread
a4ed58a9 Clean up Direct Memory Region Files Fix for different Java versions
55e35019 Set cap on JDK per-thread native byte buffer cache
b5101f4f Cleanup Region Files Direct Memory on close
81e655d7 Optimize Voxel Shape Merging
ed9fc11f Sync position on teleportation
9c326fce Nanothing to see here
3e9fc24b Attempt to fix FastLogin maybe
This commit is contained in:
William Blake Galbreath
2020-05-06 20:18:39 -05:00
parent d064334c71
commit e7b1eb157b
43 changed files with 237 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/api/0009-Bring-back-server-name.patch
View File

@@ -1,4 +1,4 @@
From 0b90223266a44ecb1cdaa22ec463a24d231cb174 Mon Sep 17 00:00:00 2001
From cc89d98244645c403a461188a6fb49bc86288213 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 26 May 2019 15:18:40 -0500
Subject: [PATCH] Bring back server name
@@ -9,10 +9,10 @@ Subject: [PATCH] Bring back server name
2 files changed, 20 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 5d42cf62..7164ff2c 100644
index 780d603e..33ccf297 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1704,4 +1704,15 @@ public final class Bukkit {
@@ -1714,4 +1714,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -29,12 +29,12 @@ index 5d42cf62..7164ff2c 100644
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index aabf82b5..5313b152 100644
index bbb2946f..8d3501a6 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1497,4 +1497,13 @@ public interface Server extends PluginMessageRecipient {
*/
boolean isStopping();
@@ -1505,4 +1505,13 @@ public interface Server extends PluginMessageRecipient {
@NotNull
com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
// Paper end
+
+ // Purpur start

10
patches/api/0013-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From f95a1f1d184934497e26f6cb76f87e0018ece82d Mon Sep 17 00:00:00 2001
From d2beebd0b8bca2ad0eef2138675d81cd0f0f9568 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:24 -0500
Subject: [PATCH] Implement lagging threshold
@@ -9,10 +9,10 @@ Subject: [PATCH] Implement lagging threshold
2 files changed, 16 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 7164ff2c..a5cc0944 100644
index 33ccf297..ee8fe48a 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1714,5 +1714,14 @@ public final class Bukkit {
@@ -1724,5 +1724,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -28,10 +28,10 @@ index 7164ff2c..a5cc0944 100644
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 5313b152..86ffcf87 100644
index 8d3501a6..c35405e0 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1505,5 +1505,12 @@ public interface Server extends PluginMessageRecipient {
@@ -1513,5 +1513,12 @@ public interface Server extends PluginMessageRecipient {
*/
@NotNull
String getServerName();

8
patches/api/0019-Add-moon-phase-API.patch
View File

@@ -1,4 +1,4 @@
From 1d2e2036690801fe7389be75853dcdd94f636d6c Mon Sep 17 00:00:00 2001
From f7117483a092158d2028933b04c54d53a637b7b8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 1 Feb 2020 22:22:07 -0600
Subject: [PATCH] Add moon phase API
@@ -11,7 +11,7 @@ Subject: [PATCH] Add moon phase API
diff --git a/src/main/java/net/pl3x/purpur/MoonPhase.java b/src/main/java/net/pl3x/purpur/MoonPhase.java
new file mode 100644
index 000000000..f5ad98c62
index 00000000..f5ad98c6
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/MoonPhase.java
@@ -0,0 +1,36 @@
@@ -52,10 +52,10 @@ index 000000000..f5ad98c62
+ }
+}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index db18f70ec..af66b8255 100644
index 421ad6a9..a9a274a9 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3216,6 +3216,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3244,6 +3244,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public List<Raid> getRaids();

6
patches/api/0020-Add-API-for-Villager-resetOffers.patch
View File

@@ -1,4 +1,4 @@
From bc0eb5d1698988e0434827cfb36e16b19f169df1 Mon Sep 17 00:00:00 2001
From 013e7bc6e20e097f054a3b76f9d6a3aa49d2f256 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Mon, 7 Oct 2019 00:15:28 -0500
Subject: [PATCH] Add API for Villager#resetOffers()
@@ -8,10 +8,10 @@ Subject: [PATCH] Add API for Villager#resetOffers()
1 file changed, 7 insertions(+)
diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
index d1579153..14434ca8 100644
index e0a3285b..32b8c4f2 100644
--- a/src/main/java/org/bukkit/entity/Villager.java
+++ b/src/main/java/org/bukkit/entity/Villager.java
@@ -110,6 +110,13 @@ public interface Villager extends AbstractVillager {
@@ -113,6 +113,13 @@ public interface Villager extends AbstractVillager {
*/
public void wakeup();

6
patches/api/0024-Add-getPlacementBlockData-to-World.patch
View File

@@ -1,4 +1,4 @@
From 9781735cd943b5c4b202fd3ea32acf628fc6e492 Mon Sep 17 00:00:00 2001
From bf422cd39e795cf7b12b77774a4c5ff1208ec819 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 00:34:36 -0500
Subject: [PATCH] Add getPlacementBlockData to World
@@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World
1 file changed, 10 insertions(+)
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index af66b8255..04ced7551 100644
index a9a274a9..d67d4355 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3224,6 +3224,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3252,6 +3252,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
@NotNull
net.pl3x.purpur.MoonPhase getMoonPhase();

16
patches/api/0033-More-anvil-controls.patch
View File

@@ -1,4 +1,4 @@
From b1ef79818f5336bb401f9a43c0c388a1670bf434 Mon Sep 17 00:00:00 2001
From 1f9945fb4f4524e6faf06b2b374a3c4a66aaf80b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 19 Apr 2020 00:25:09 -0500
Subject: [PATCH] More anvil controls
@@ -13,7 +13,7 @@ Subject: [PATCH] More anvil controls
diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
new file mode 100644
index 000000000..85663c0a4
index 00000000..85663c0a
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
@@ -0,0 +1,52 @@
@@ -71,7 +71,7 @@ index 000000000..85663c0a4
+}
diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
new file mode 100644
index 000000000..2717ad82c
index 00000000..2717ad82
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
@@ -0,0 +1,35 @@
@@ -111,13 +111,13 @@ index 000000000..2717ad82c
+ }
+}
diff --git a/src/main/java/org/bukkit/inventory/AnvilInventory.java b/src/main/java/org/bukkit/inventory/AnvilInventory.java
index 4af562426..086d4b022 100644
index b95e563b..435026e5 100644
--- a/src/main/java/org/bukkit/inventory/AnvilInventory.java
+++ b/src/main/java/org/bukkit/inventory/AnvilInventory.java
@@ -49,4 +49,14 @@ public interface AnvilInventory extends Inventory {
* @param levels the maximum experience cost
*/
void setMaximumRepairCost(int levels);
@@ -109,4 +109,14 @@ public interface AnvilInventory extends Inventory {
setItem(2, result);
}
// Paper end
+
+ // Purpur start
+ boolean canBypassCost();