Merge pull request MultiPaper#264 from MultiPaper/update-upstream

Update Upstream
kajkul · Sep 20, 2022 · d0c6765 · d0c6765
2 parents ae90106 + 68c5802
commit d0c6765
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ group = puregero.multipaper
 version = 1.19.2-R0.1-SNAPSHOT
 mcVersion = 1.19.2
 
-paperRef = 63cb7472acb69d5a53bb806408d692e4df17cc32
+paperRef = 8db45c43121185f0e65cf31767ede2d79d2f4a65
 
 org.gradle.caching=true
 org.gradle.parallel=true

diff --git a/patches/api/0001-Expose-findClass-for-profiler.patch b/patches/api/0001-Expose-findClass-for-profiler.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose findClass for profiler
 
 
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 8a39c48fce819d72a94d5309db8dfc42930989af..379b49f13a8c676125e17ad9207884a5d6cb5b7b 100644
+index f7cfe6c0d9d52ed72d0d45baaaf856c15769c668..5ed2913dfc5810ae201f0c30a4beb31dc76cec68 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-@@ -151,6 +151,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
+@@ -172,6 +172,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
          throw new ClassNotFoundException(name);
      }
 

diff --git a/patches/api/0002-Ignore-lookups-if-closed.patch b/patches/api/0002-Ignore-lookups-if-closed.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ignore lookups if closed
 
 
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index d697a0d48ddcd60e6fb3a37c83c629e2b1b102ee..03308aa834937154c86256d4f209c63d8e7bf516 100644
+index 5ed2913dfc5810ae201f0c30a4beb31dc76cec68..3cac4b151ec782f13c0ed0e9c6e3aa5f8e4587ee 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -46,6 +46,8 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -17,7 +17,7 @@ index d697a0d48ddcd60e6fb3a37c83c629e2b1b102ee..03308aa834937154c86256d4f209c63d
      static {
          ClassLoader.registerAsParallelCapable();
      }
-@@ -159,7 +161,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
+@@ -180,7 +182,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
          }
          Class<?> result = classes.get(name);
 
@@ -26,15 +26,15 @@ index d697a0d48ddcd60e6fb3a37c83c629e2b1b102ee..03308aa834937154c86256d4f209c63d
              String path = name.replace('.', '/').concat(".class");
              JarEntry entry = jar.getJarEntry(path);
 
-@@ -206,6 +208,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
+@@ -227,6 +229,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
              classes.put(name, result);
          }
 
 +        if (result == null) throw new ClassNotFoundException(name); // Pufferfish
          return result;
      }
 
-@@ -214,6 +217,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
+@@ -235,6 +238,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
          try {
              super.close();
          } finally {

diff --git a/patches/server/0172-Save-lightning-bolt-data.patch b/patches/server/0172-Save-lightning-bolt-data.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Save lightning bolt data
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LightningBolt.java b/src/main/java/net/minecraft/world/entity/LightningBolt.java
-index 359c78b4f98c38c81af27a2c4cf0939da51e5a0b..bc71c40c3b018aa42373e9b8185226ebff37caf4 100644
+index 50612c00f53821ccafce94835caf1ba442be299a..9ad7ff2933b4f5c039a8bb417381bee48b2cce91 100644
 --- a/src/main/java/net/minecraft/world/entity/LightningBolt.java
 +++ b/src/main/java/net/minecraft/world/entity/LightningBolt.java
-@@ -270,10 +270,34 @@ public class LightningBolt extends Entity {
+@@ -276,10 +276,34 @@ public class LightningBolt extends Entity {
      protected void defineSynchedData() {}
 
      @Override