Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-10-01 07:57:29 +02:00
Code Issues Projects Releases Wiki Activity

[CI-SKIP] rebuild patches

Browse Source
This commit is contained in:
Shane Freeder 2020-01-18 17:58:05 +00:00
parent 3d51966885
commit 00860e4e10
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
11 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/0415-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch → Spigot-Server-Patches/0416-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
View File

@ -1,11 +1,11 @@
From e1ae2bc922bc530ff7d31b00291ce52a16d14163 Mon Sep 17 00:00:00 2001
From ba28067d4c0a7fcd2cfa9cc141ed1318649afffd Mon Sep 17 00:00:00 2001
From: Callahan <mr.callahhh@gmail.com>
Date: Mon, 13 Jan 2020 23:47:28 -0600
Subject: [PATCH] Prevent sync chunk loads when villagers try to find beds
diff --git a/src/main/java/net/minecraft/server/BehaviorSleep.java b/src/main/java/net/minecraft/server/BehaviorSleep.java
index fa575dde..dfe0f665 100644
index fa575dde1..dfe0f6650 100644
--- a/src/main/java/net/minecraft/server/BehaviorSleep.java
+++ b/src/main/java/net/minecraft/server/BehaviorSleep.java
@@ -31,7 +31,8 @@ public class BehaviorSleep extends Behavior<EntityLiving> {
@ -19,5 +19,5 @@ index fa575dde..dfe0f665 100644
return globalpos.getBlockPosition().a((IPosition) entityliving.getPositionVector(), 2.0D) && iblockdata.getBlock().a(TagsBlock.BEDS) && !(Boolean) iblockdata.get(BlockBed.OCCUPIED);
}
--
2.21.0 (Apple Git-122.2)
2.25.0

6
Spigot-Server-Patches/0416-Fix-spawn-radius-being-treated-as-0.patch → Spigot-Server-Patches/0417-Fix-spawn-radius-being-treated-as-0.patch
View File

@ -1,11 +1,11 @@
From 12a0c60fd1aa113b525117c6d92c8ab12f5fb58c Mon Sep 17 00:00:00 2001
From 253abe5c3a4d5b2638ee6ce820343100098e467d Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 15 Dec 2019 19:41:28 +0000
Subject: [PATCH] Fix spawn radius being treated as 0
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index f130c5ddc..ed6f1b1a3 100644
index eca1841b2..07d7ac56e 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -123,7 +123,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -18,5 +18,5 @@ index f130c5ddc..ed6f1b1a3 100644
int j = MathHelper.floor(worldserver.getWorldBorder().b((double) blockposition.getX(), (double) blockposition.getZ()));
--
2.24.1
2.25.0

4
Spigot-Server-Patches/0417-MC-145656-Fix-Follow-Range-Initial-Target.patch → Spigot-Server-Patches/0418-MC-145656-Fix-Follow-Range-Initial-Target.patch
View File

@ -1,4 +1,4 @@
From aaf33f160019b436880109d1cee7f5014f74c1dd Mon Sep 17 00:00:00 2001
From cbe17bc833a073c04a5e37568cedcd8e4f48303f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Wed, 18 Dec 2019 22:21:35 -0600
Subject: [PATCH] MC-145656 Fix Follow Range Initial Target
@ -63,5 +63,5 @@ index c76a43837..e35ec2db0 100644
+ // Paper end
}
--
2.25.0.windows.1
2.25.0

4
Spigot-Server-Patches/0418-Optimize-Hoppers.patch → Spigot-Server-Patches/0419-Optimize-Hoppers.patch
View File

@ -1,4 +1,4 @@
From 63066de2ceac7c8eba20a27cf786d230eb7badfa Mon Sep 17 00:00:00 2001
From c8eb8e9afa91d412c07fe63c11b1287d51340812 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 27 Apr 2016 22:09:52 -0400
Subject: [PATCH] Optimize Hoppers
@ -307,5 +307,5 @@ index e08faf538..5dded0abe 100644
flag = true;
} else if (a(itemstack1, itemstack)) {
--
2.25.0.windows.1
2.25.0

6
Spigot-Server-Patches/0419-PlayerDeathEvent-shouldDropExperience.patch → Spigot-Server-Patches/0420-PlayerDeathEvent-shouldDropExperience.patch
View File

@ -1,11 +1,11 @@
From 8caf4eff00e70bc61e956352d3547a6a231b89a5 Mon Sep 17 00:00:00 2001
From 49358ef040460f25448876b8f2a3027c6eddb06c Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 24 Dec 2019 00:35:42 +0000
Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index f28de40a7..1ec29f157 100644
index 07d7ac56e..9a61dda82 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -639,7 +639,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -18,5 +18,5 @@ index f28de40a7..1ec29f157 100644
if (!event.getKeepInventory()) {
// Paper start - replace logic
--
2.24.1
2.25.0

6
Spigot-Server-Patches/0420-Prevent-bees-loading-chunks-checking-hive-position.patch → Spigot-Server-Patches/0421-Prevent-bees-loading-chunks-checking-hive-position.patch
View File

@ -1,11 +1,11 @@
From c8fb0f10a59a80ced169f7b82aa795e315a761f1 Mon Sep 17 00:00:00 2001
From d5359117d37570a72d2655acf6d55259c29b107c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 5 Jan 2020 17:24:34 -0600
Subject: [PATCH] Prevent bees loading chunks checking hive position
diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
index fb1c0a96..829aab7f 100644
index fb1c0a965..829aab7f7 100644
--- a/src/main/java/net/minecraft/server/EntityBee.java
+++ b/src/main/java/net/minecraft/server/EntityBee.java
@@ -386,6 +386,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
@ -17,5 +17,5 @@ index fb1c0a96..829aab7f 100644
return tileentity != null && tileentity.getTileType() == TileEntityTypes.BEEHIVE;
--
2.24.0
2.25.0

4
Spigot-Server-Patches/0421-Don-t-load-Chunks-from-Hoppers-and-other-things.patch → Spigot-Server-Patches/0422-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
View File

@ -1,4 +1,4 @@
From 42319bc0833fa22b57adfca1b81c422be0fc7526 Mon Sep 17 00:00:00 2001
From 5188398998617b7bcac6700d417981aa4693f577 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Nov 2016 20:28:12 -0400
Subject: [PATCH] Don't load Chunks from Hoppers and other things
@ -32,5 +32,5 @@ index 3cb6e6089..7a16a3e0e 100644
DoubleBlockFinder.BlockType doubleblockfinder_blocktype1 = (DoubleBlockFinder.BlockType) function.apply(iblockdata1);
--
2.24.1
2.25.0

4
Spigot-Server-Patches/0422-Guard-against-serializing-mismatching-chunk-coordina.patch → Spigot-Server-Patches/0423-Guard-against-serializing-mismatching-chunk-coordina.patch
View File

@ -1,4 +1,4 @@
From 4feed34cc8482b201d1c0a61edc1590991e19016 Mon Sep 17 00:00:00 2001
From 6bd0d983bbd84cb2fcc32655bdfbff511c7856f4 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 27 Dec 2019 09:42:26 -0800
Subject: [PATCH] Guard against serializing mismatching chunk coordinate
@ -53,5 +53,5 @@ index 134c76065..25c8b131f 100644
if (this.c != null) {
synchronized (this.persistentDataLock) { // Paper - Async chunk loading
--
2.24.1
2.25.0

4
Spigot-Server-Patches/0423-Optimise-IEntityAccess-getPlayerByUUID.patch → Spigot-Server-Patches/0424-Optimise-IEntityAccess-getPlayerByUUID.patch
View File

@ -1,4 +1,4 @@
From a5463b6d5022e62cc68e44454be6da47e0f735c5 Mon Sep 17 00:00:00 2001
From 05b1422690929330ad3ec07e842be83e1bde932e Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sat, 11 Jan 2020 21:50:56 -0800
Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID
@ -43,5 +43,5 @@ index 70cbff313..8526a3fda 100644
public final com.destroystokyo.paper.io.PaperFileIOThread.ChunkDataController poiDataController = new com.destroystokyo.paper.io.PaperFileIOThread.ChunkDataController() {
@Override
--
2.24.1.windows.2
2.25.0

6
Spigot-Server-Patches/0424-Optimize-call-to-getFluid-for-explosions.patch → Spigot-Server-Patches/0425-Optimize-call-to-getFluid-for-explosions.patch
View File

@ -1,11 +1,11 @@
From f0b4cbaaa6aec911755c4211356befd1577d3a8a Mon Sep 17 00:00:00 2001
From 1a6991687467e5185c35416c069b6bc2de0e7d5d Mon Sep 17 00:00:00 2001
From: BrodyBeckwith <brody@beckwith.dev>
Date: Tue, 14 Jan 2020 17:49:03 -0500
Subject: [PATCH] Optimize call to getFluid for explosions
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
index 8762a566..3fd4c12b 100644
index 8762a566d..3fd4c12b1 100644
--- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -117,7 +117,7 @@ public class Explosion {
@ -18,5 +18,5 @@ index 8762a566..3fd4c12b 100644
if (!iblockdata.isAir() || !fluid.isEmpty()) {
float f2 = Math.max(iblockdata.getBlock().getDurability(), fluid.k());
--
2.20.1.windows.1
2.25.0

4
Spigot-Server-Patches/0425-Fix-last-firework-in-stack-not-having-effects-when-d.patch → Spigot-Server-Patches/0426-Fix-last-firework-in-stack-not-having-effects-when-d.patch
View File

@ -1,4 +1,4 @@
From 875fded55e5170ede0b2319cce255b07da30923a Mon Sep 17 00:00:00 2001
From 263439fcd83d5d67e1e5d6fe99bdc42a6719d481 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 17 Jan 2020 18:44:55 -0800
Subject: [PATCH] Fix last firework in stack not having effects when dispensed
@ -22,5 +22,5 @@ index 9a8be1474..02d2e9a84 100644
entityfireworks.shoot(d0, d1, d2, 0.5F, 1.0F);
isourceblock.getWorld().addEntity(entityfireworks);
--
2.25.0.windows.1
2.25.0