Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 18:45:54 +01:00
Code Issues Projects Releases Wiki Activity

fix patch mis-order

Browse Source
This commit is contained in:
Jake Potrebic 2021-06-19 10:45:48 -07:00
parent 512e7c99ae
commit 1882ec3c07
No known key found for this signature in database
GPG Key ID: 7C58557EC9C421F8
12 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/api/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch → patches/api/0134-Provide-Chunk-Coordinates-as-a-Long-API.patch
View File

@ -44,7 +44,7 @@ index beac1439c71fb28f1a3baecf56157237e12ccfd5..fa576096e908f8fbdbef53e1bd91215a
* Gets the world containing this chunk
*
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index e88c98528ca9e8d636e0b30f4209f7205c5eb9f6..f45bea24a350c3700bdbf4c44aeb1c0562e57d9e 100644
index a7bd869fb5b8e35274eee0d8dae9dd6fe3c1c540..85c9ea1241d580386be00fb85ea1446addd376c4 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -207,6 +207,22 @@ public interface World extends PluginMessageRecipient, Metadatable, net.kyori.ad

0
patches/api/0136-Make-EnderDragon-extend-Mob.patch → patches/api/0135-Make-EnderDragon-extend-Mob.patch
View File

0
patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch → patches/api/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
View File

0
patches/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch → patches/api/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
View File

2
patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch → patches/api/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch
View File

@ -48,7 +48,7 @@ index 369ce9ff6c8bb97a64a8e229115564412e6e7654..e700875beb76dadd55b585aca748338d
* @return A new location where X/Y/Z are the center of the block
*/
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index f45bea24a350c3700bdbf4c44aeb1c0562e57d9e..a653a09968123724f9ec5501760257b3944b49c9 100644
index 85c9ea1241d580386be00fb85ea1446addd376c4..4f563c6afc3568a5a45594bcc87790eeefc4148d 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -90,6 +90,38 @@ public interface World extends PluginMessageRecipient, Metadatable, net.kyori.ad

0
patches/api/0140-Slime-Pathfinder-Events.patch → patches/api/0139-Slime-Pathfinder-Events.patch
View File

0
patches/api/0141-Add-PhantomPreSpawnEvent.patch → patches/api/0140-Add-PhantomPreSpawnEvent.patch
View File

0
patches/api/0142-Add-More-Creeper-API.patch → patches/api/0141-Add-More-Creeper-API.patch
View File

2
patches/api/0143-isChunkGenerated-API.patch → patches/api/0142-isChunkGenerated-API.patch
View File

@ -34,7 +34,7 @@ index e700875beb76dadd55b585aca748338def286908..9c91c49ed7302c12fcb1d8e9bc58712e
/**
* Sets the position of this Location and returns itself
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index a653a09968123724f9ec5501760257b3944b49c9..1264c65235e622f648d71ef10d804ef5193da973 100644
index 4f563c6afc3568a5a45594bcc87790eeefc4148d..868e34482a3a5773dfbdc80b36adcee25239614a 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -253,6 +253,17 @@ public interface World extends PluginMessageRecipient, Metadatable, net.kyori.ad

0
patches/api/0144-Add-source-block-to-BlockPhysicsEvent.patch → patches/api/0143-Add-source-block-to-BlockPhysicsEvent.patch
View File

0
patches/api/0145-Inventory-removeItemAnySlot.patch → patches/api/0144-Inventory-removeItemAnySlot.patch
View File

6
patches/api/0134-Async-Chunks-API.patch → patches/api/0145-Async-Chunks-API.patch
View File

@ -8,10 +8,10 @@ Adds API's to load or generate chunks asynchronously.
Also adds utility methods to Entity to teleport asynchronously.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index a7bd869fb5b8e35274eee0d8dae9dd6fe3c1c540..e88c98528ca9e8d636e0b30f4209f7205c5eb9f6 100644
index 868e34482a3a5773dfbdc80b36adcee25239614a..1264c65235e622f648d71ef10d804ef5193da973 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -910,6 +910,482 @@ public interface World extends PluginMessageRecipient, Metadatable, net.kyori.ad
@@ -969,6 +969,482 @@ public interface World extends PluginMessageRecipient, Metadatable, net.kyori.ad
}
return nearby;
}
@ -495,7 +495,7 @@ index a7bd869fb5b8e35274eee0d8dae9dd6fe3c1c540..e88c98528ca9e8d636e0b30f4209f720
/**
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index ef95afb92f7a6fea77fe483e26ee3cf6d1bdd041..896b86c212767264c81eb1868a061979e4536c6c 100644
index 38d7685063bf47491c55c1911c6f2cb915f64202..92927b9a90b2a4497dd572f6f752c40cf35dd8b8 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -163,6 +163,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent