Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +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:
c712f2c0 [1.16] Improve performance of matching ingredients for shapeless recipes (#4694)
ecb4ccd6 Updated Upstream (Bukkit/CraftBukkit) (#4688)
3fc340d8 [Auto] Updated Upstream (CraftBukkit)
f8eaa585 Add support for RanagedEntity API for newer mobs (Fixes #4678)
This commit is contained in:
William Blake Galbreath
2020-10-27 14:27:36 -05:00
parent 54fdd690f7
commit cc6c1675e4
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: d0ad658b0c...c712f2c053

2
current-paper
View File

@@ -1 +1 @@
1.16.3--6ba4ed5238bb4963a86e613d22f6e8e367f44436
1.16.3--15e754bfe56a3d1f5ec8d0d16ef0d96ac55219aa

4
patches/server/0030-Disable-outdated-build-check.patch
View File

@@ -5,14 +5,14 @@ Subject: [PATCH] Disable outdated build check
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 3261d2255..2825f5a3a 100644
index 3313d316fa..94aa512c45 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -259,7 +259,7 @@ public class Main {
System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
}
- if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
- if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
+ if (false) { // Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { // Purpur
Date buildDate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(Main.class.getPackage().getImplementationVendor()); // Paper

6
patches/server/0126-Despawn-rate-config-options-per-projectile-type.patch
View File

@@ -192,10 +192,10 @@ index 226b346436..b482dce83b 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntitySmallFireball.java b/src/main/java/net/minecraft/server/EntitySmallFireball.java
index 92efb29534..f884e4cf7a 100644
index 350e92ac99..4ed7a20bfe 100644
--- a/src/main/java/net/minecraft/server/EntitySmallFireball.java
+++ b/src/main/java/net/minecraft/server/EntitySmallFireball.java
@@ -88,4 +88,11 @@ public class EntitySmallFireball extends EntityFireballFireball {
@@ -86,4 +86,11 @@ public class EntitySmallFireball extends EntityFireballFireball {
public boolean damageEntity(DamageSource damagesource, float f) {
return false;
}
@@ -300,7 +300,7 @@ index 9a17eb6066..f0b8982893 100644
public boolean checkIfLeftOwner() { return this.h(); } // Purpur - OBFHELPER
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9e03fd5d89..24b3c7c19c 100644
index 07c1b2ca63..8ff4e3127b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -147,6 +147,35 @@ public class PurpurWorldConfig {