core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CI-SKIP] [Auto] Rebuild Patches 

A recent commit has been made that caused patches to be out of order, rebuilding
This commit is contained in:
Aikar 2018-10-17 23:06:33 -04:00
parent 4168fa182e
commit 42772e476a
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0393-Limit-lightning-strike-effect-distance.patch → Spigot-Server-Patches/0394-Limit-lightning-strike-effect-distance.patch
View File

@ -1,11 +1,11 @@
From d723ec8024fb555d6ba49215319aafbf74c3a0ff Mon Sep 17 00:00:00 2001 From 4019f5499718146069b86ac3265e88c1a7e2c9a1 Mon Sep 17 00:00:00 2001
From: Trigary <trigary0@gmail.com> From: Trigary <trigary0@gmail.com>
Date: Fri, 14 Sep 2018 17:42:08 +0200 Date: Fri, 14 Sep 2018 17:42:08 +0200
Subject: [PATCH] Limit lightning strike effect distance Subject: [PATCH] Limit lightning strike effect distance
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 93bf8c6d3..25246eac5 100644 index 93bf8c6d3c..25246eac58 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -237,6 +237,30 @@ public class PaperWorldConfig { @@ -237,6 +237,30 @@ public class PaperWorldConfig {
@ -40,7 +40,7 @@ index 93bf8c6d3..25246eac5 100644
public boolean firePhysicsEventForRedstone = false; public boolean firePhysicsEventForRedstone = false;
private void firePhysicsEventForRedstone() { private void firePhysicsEventForRedstone() {
diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
index afbe43dd3..f64e6e864 100644 index afbe43dd34..f64e6e864d 100644
--- a/src/main/java/net/minecraft/server/EntityLightning.java --- a/src/main/java/net/minecraft/server/EntityLightning.java
+++ b/src/main/java/net/minecraft/server/EntityLightning.java +++ b/src/main/java/net/minecraft/server/EntityLightning.java
@@ -60,6 +60,14 @@ public class EntityLightning extends EntityWeather { @@ -60,6 +60,14 @@ public class EntityLightning extends EntityWeather {
@ -68,7 +68,7 @@ index afbe43dd3..f64e6e864 100644
--this.lifeTicks; --this.lifeTicks;
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 0a7648263..b41dc3a73 100644 index 0a76482638..b41dc3a732 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1087,7 +1087,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -1087,7 +1087,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -81,5 +81,5 @@ index 0a7648263..b41dc3a73 100644
} else { } else {
return false; return false;
-- --
2.19.0 2.19.1

8
Spigot-Server-Patches/0394-Implement-getters-and-setters-for-EntityItem-owner-a.patch → Spigot-Server-Patches/0395-Implement-getters-and-setters-for-EntityItem-owner-a.patch
View File

@ -1,4 +1,4 @@
From ee7193b21f5f53806d0e97db356d47f46d9b9d55 Mon Sep 17 00:00:00 2001 From beb6f53cb74202be5ba6f91d544f59bf5552e514 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 6 Oct 2018 20:54:23 -0500 Date: Sat, 6 Oct 2018 20:54:23 -0500
Subject: [PATCH] Implement getters and setters for EntityItem owner and Subject: [PATCH] Implement getters and setters for EntityItem owner and
@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and
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 f596b4351..67b29c55f 100644 index f596b4351b..67b29c55f6 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
@@ -410,20 +410,22 @@ public class EntityItem extends Entity { @@ -410,20 +410,22 @@ public class EntityItem extends Entity {
@ -37,7 +37,7 @@ index f596b4351..67b29c55f 100644
this.f = uuid; this.f = uuid;
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
index 1df17f09b..3da71da5c 100644 index 1df17f09bb..3da71da5c2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
@@ -9,6 +9,11 @@ import org.bukkit.inventory.ItemStack; @@ -9,6 +9,11 @@ import org.bukkit.inventory.ItemStack;
@ -92,5 +92,5 @@ index 1df17f09b..3da71da5c 100644
@Override @Override
-- --
2.19.0 2.19.1

2
Spigot-Server-Patches/0395-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch → Spigot-Server-Patches/0396-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
View File

@ -1,4 +1,4 @@
From d6423d5e60baa126e36ae5a5dddca163a36992d6 Mon Sep 17 00:00:00 2001 From 10ed67d0aaea1d1c33432e54ccbc5fe324b2a33b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 17 Oct 2018 19:17:27 -0400 Date: Wed, 17 Oct 2018 19:17:27 -0400
Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles

2
Spigot-Server-Patches/0396-Ensure-chunk-neighbor-counts-do-not-get-desynced.patch → Spigot-Server-Patches/0397-Ensure-chunk-neighbor-counts-do-not-get-desynced.patch
View File

@ -1,4 +1,4 @@
From 5d6a6cd178b5baef11c1a52c7f91bf71ef789da4 Mon Sep 17 00:00:00 2001 From 7e6256031e8db371c47b33f612150c7c0f9aee17 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 17 Oct 2018 22:31:54 -0400 Date: Wed, 17 Oct 2018 22:31:54 -0400
Subject: [PATCH] Ensure chunk neighbor counts do not get desynced Subject: [PATCH] Ensure chunk neighbor counts do not get desynced