Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-23 09:27:45 +01:00
Code Issues Projects Releases Wiki Activity

[CI-SKIP] Rebuild patches

Browse Source
This commit is contained in:
Shane Freeder 2020-01-20 16:04:39 +00:00
parent 86a4b75200
commit 9c2d9a5f41
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0425-Fix-items-not-falling-correctly.patch
View File

@ -1,9 +1,9 @@
From e748f07aa4a2d6c1e2b85f64bc9505f8a0163bb8 Mon Sep 17 00:00:00 2001 From 8d1d14d443a17c93f6ce7feb9b75e40f1ef060bb Mon Sep 17 00:00:00 2001
From: AJMFactsheets <AJMFactsheets@gmail.com> From: AJMFactsheets <AJMFactsheets@gmail.com>
Date: Fri, 17 Jan 2020 17:17:54 -0600 Date: Fri, 17 Jan 2020 17:17:54 -0600
Subject: [PATCH] Fix items not falling correctly Subject: [PATCH] Fix items not falling correctly
Since 1.14, Mojang has added an optimization which skips checking if Since 1.14, Mojang has added an optimization which skips checking if
an item should fall every fourth tick. an item should fall every fourth tick.
However, Spigot's entity activation range class also has an However, Spigot's entity activation range class also has an
@ -15,7 +15,7 @@ This patch resolves the conflict by offsetting checking an item's
move method from Spigot's entity activation range check. move method from Spigot's entity activation range check.
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index e61af3f5..30a7843b 100644 index e61af3f5e..d15a9fcfb 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java --- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -86,7 +86,7 @@ public class EntityItem extends Entity { @@ -86,7 +86,7 @@ public class EntityItem extends Entity {
@ -28,5 +28,5 @@ index e61af3f5..30a7843b 100644
float f = 0.98F; float f = 0.98F;
-- --
2.17.1 2.25.0

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

@ -1,4 +1,4 @@
From 1a6991687467e5185c35416c069b6bc2de0e7d5d Mon Sep 17 00:00:00 2001 From aeabd8ac2eedc092054b266c0cb9af1b7c530ea9 Mon Sep 17 00:00:00 2001
From: BrodyBeckwith <brody@beckwith.dev> From: BrodyBeckwith <brody@beckwith.dev>
Date: Tue, 14 Jan 2020 17:49:03 -0500 Date: Tue, 14 Jan 2020 17:49:03 -0500
Subject: [PATCH] Optimize call to getFluid for explosions Subject: [PATCH] Optimize call to getFluid for explosions

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

@ -1,4 +1,4 @@
From 263439fcd83d5d67e1e5d6fe99bdc42a6719d481 Mon Sep 17 00:00:00 2001 From 1ea6a2cbd8595c611adbc561e06b200be7696020 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com> From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 17 Jan 2020 18:44:55 -0800 Date: Fri, 17 Jan 2020 18:44:55 -0800
Subject: [PATCH] Fix last firework in stack not having effects when dispensed Subject: [PATCH] Fix last firework in stack not having effects when dispensed

16
Spigot-Server-Patches/0427-Activation-Range-Improvements.patch → Spigot-Server-Patches/0428-Activation-Range-Improvements.patch
View File

@ -1,4 +1,4 @@
From d79df9f9beb57badf14555a65694a078695b3505 Mon Sep 17 00:00:00 2001 From 58a93912d33063d61700ffa253c1feadba39142a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 13 May 2016 01:38:06 -0400 Date: Fri, 13 May 2016 01:38:06 -0400
Subject: [PATCH] Activation Range Improvements Subject: [PATCH] Activation Range Improvements
@ -10,7 +10,7 @@ Fixes and adds new Immunities to improve gameplay behavior
Adds water Mobs to activation range config and nerfs fish Adds water Mobs to activation range config and nerfs fish
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index f0d1a5b14..c993a5522 100644 index 77d7e6885..9143f5ee8 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -554,6 +554,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -554,6 +554,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -34,7 +34,7 @@ index b40c8d2f8..4eda13075 100644
protected EntityCreature(EntityTypes<? extends EntityCreature> entitytypes, World world) { protected EntityCreature(EntityTypes<? extends EntityCreature> entitytypes, World world) {
super(entitytypes, world); super(entitytypes, world);
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 6bad1687f..fb395bbb5 100644 index 5fb3c948d..e0355d3a3 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java --- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -112,6 +112,17 @@ public abstract class EntityInsentient extends EntityLiving { @@ -112,6 +112,17 @@ public abstract class EntityInsentient extends EntityLiving {
@ -164,7 +164,7 @@ index 44bb18c59..f8944f860 100644
this.d.stream().filter((pathfindergoalwrapped) -> { this.d.stream().filter((pathfindergoalwrapped) -> {
return pathfindergoalwrapped.j() == pathfindergoal; return pathfindergoalwrapped.j() == pathfindergoal;
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index f86404f83..bd7d44f1d 100644 index 92601c581..6e165a164 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java --- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -33,12 +33,18 @@ import net.minecraft.server.MathHelper; @@ -33,12 +33,18 @@ import net.minecraft.server.MathHelper;
@ -219,7 +219,7 @@ index f86404f83..bd7d44f1d 100644
int i = MathHelper.floor( maxBB.minX / 16.0D ); int i = MathHelper.floor( maxBB.minX / 16.0D );
int j = MathHelper.floor( maxBB.maxX / 16.0D ); int j = MathHelper.floor( maxBB.maxX / 16.0D );
@@ -212,7 +223,7 @@ public class ActivationRange @@ -213,7 +224,7 @@ public class ActivationRange
{ {
return true; return true;
} }
@ -228,7 +228,7 @@ index f86404f83..bd7d44f1d 100644
{ {
return true; return true;
} }
@@ -220,6 +231,12 @@ public class ActivationRange @@ -221,6 +232,12 @@ public class ActivationRange
{ {
return true; return true;
} }
@ -241,7 +241,7 @@ index f86404f83..bd7d44f1d 100644
if ( entity instanceof EntityAnimal ) if ( entity instanceof EntityAnimal )
{ {
EntityAnimal animal = (EntityAnimal) entity; EntityAnimal animal = (EntityAnimal) entity;
@@ -266,9 +283,13 @@ public class ActivationRange @@ -267,9 +284,13 @@ public class ActivationRange
entity.activatedTick = MinecraftServer.currentTick + 20; entity.activatedTick = MinecraftServer.currentTick + 20;
} }
isActive = true; isActive = true;
@ -277,5 +277,5 @@ index c2906f20a..885512396 100644
log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Ra " + raiderActivationRange + " / Mi " + miscActivationRange + " / Tiv " + tickInactiveVillagers ); log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Ra " + raiderActivationRange + " / Mi " + miscActivationRange + " / Tiv " + tickInactiveVillagers );
} }
-- --
2.22.0 2.25.0

2
Spigot-Server-Patches/0427-Add-effect-to-block-break-naturally.patch → Spigot-Server-Patches/0429-Add-effect-to-block-break-naturally.patch
View File

@ -1,4 +1,4 @@
From 7843c52321c07cb7998260731313b3f582b3699b Mon Sep 17 00:00:00 2001 From 2147836df3d636fd7c9b27f2697b5c6acbaee475 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com> From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 2 Jan 2020 12:25:07 -0600 Date: Thu, 2 Jan 2020 12:25:07 -0600
Subject: [PATCH] Add effect to block break naturally Subject: [PATCH] Add effect to block break naturally

4
Spigot-Server-Patches/0428-Tracking-Range-Improvements.patch → Spigot-Server-Patches/0430-Tracking-Range-Improvements.patch
View File

@ -1,4 +1,4 @@
From 4ef1788fd4f13d61cf83a054b220a564bfe9c010 Mon Sep 17 00:00:00 2001 From 2b7b877d32c3b5a1d308515210267a7e17c4fdd8 Mon Sep 17 00:00:00 2001
From: kickash32 <kickash32@gmail.com> From: kickash32 <kickash32@gmail.com>
Date: Sat, 21 Dec 2019 15:22:09 -0500 Date: Sat, 21 Dec 2019 15:22:09 -0500
Subject: [PATCH] Tracking Range Improvements Subject: [PATCH] Tracking Range Improvements
@ -60,5 +60,5 @@ index 6f8e6c1d0..46c33e691 100644
} }
} }
-- --
2.22.0 2.25.0