diff options
author | Jake Potrebic <[email protected]> | 2024-04-27 18:00:01 -0700 |
---|---|---|
committer | Jake Potrebic <[email protected]> | 2024-04-27 18:00:01 -0700 |
commit | 3e90a1918392a435cbfe40eea6f077076faf275a (patch) | |
tree | 38708c74d12698274d2632efd230ab024e4d77de /patches/api/0009-Paper-Plugins.patch | |
parent | d964c15e15bff629b4999fbf3df09c5b1e6e2049 (diff) | |
download | Paper-3e90a1918392a435cbfe40eea6f077076faf275a.tar.gz Paper-3e90a1918392a435cbfe40eea6f077076faf275a.zip |
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
304e83eb PR-1002: Improve documentation and implementation of getMaxStackSize
e8215ea2 SPIGOT-7638: Library loader does not seem to resolve every dependency
79c595c0 SPIGOT-7637: Bad logic in checking nullability of AttributeModifier slots
CraftBukkit Changes:
91b1fc3f1 SPIGOT-7644: Fix ItemMeta#getAsString
4e77a81e1 SPIGOT-7615: PlayerLeashEntityEvent cancelled eats lead
996f660f3 Do not remove leash knot if leasing to an existing leash knot gets cancelled
f70367d42 SPIGOT-7643: Fix inverted leash event cancelled usage and remove leash knot if no entity gets leashed
7ddb48294 SPIGOT-7640: Abnormal jumping height of wind charge
080c8711e SPIGOT-7639: Incoming plugin channels not working
ad549847e Open a direct connection instead of pinging mojang server to check if it is reachable
38e2926c5 SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime
Diffstat (limited to 'patches/api/0009-Paper-Plugins.patch')
-rw-r--r-- | patches/api/0009-Paper-Plugins.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/api/0009-Paper-Plugins.patch b/patches/api/0009-Paper-Plugins.patch index 7344dee5ae..41dcaf4cf1 100644 --- a/patches/api/0009-Paper-Plugins.patch +++ b/patches/api/0009-Paper-Plugins.patch @@ -2062,7 +2062,7 @@ index 047c0304fd617cec990f80815b43916c6ef5a94c..ab04ffe4cd05315a2ee0f64c553b4c67 throw ex; } catch (Throwable ex) { diff --git a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java -index 6d634b0ea813ccb19f1562a7d0e5a59cea4eab21..653135352c104a6ddeb74a1b6d4916c6952d6271 100644 +index 160f8c348271154c672adf936b358ffeb3b63e69..f4d655a158410039305ac68cebe0d79000f73df8 100644 --- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java +++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java @@ -36,7 +36,10 @@ import org.eclipse.aether.transport.http.HttpTransporterFactory; @@ -2085,7 +2085,7 @@ index 6d634b0ea813ccb19f1562a7d0e5a59cea4eab21..653135352c104a6ddeb74a1b6d4916c6 session.setChecksumPolicy( RepositoryPolicy.CHECKSUM_POLICY_FAIL ); session.setLocalRepositoryManager( repository.newLocalRepositoryManager( session, new LocalRepository( "libraries" ) ) ); session.setTransferListener( new AbstractTransferListener() -@@ -79,7 +83,7 @@ class LibraryLoader +@@ -84,7 +88,7 @@ class LibraryLoader } logger.log( Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[] { @@ -2094,7 +2094,7 @@ index 6d634b0ea813ccb19f1562a7d0e5a59cea4eab21..653135352c104a6ddeb74a1b6d4916c6 } ); List<Dependency> dependencies = new ArrayList<>(); -@@ -117,7 +121,7 @@ class LibraryLoader +@@ -122,7 +126,7 @@ class LibraryLoader jarFiles.add( url ); logger.log( Level.INFO, "[{0}] Loaded library {1}", new Object[] { |