Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Allow configurable nether void height damage

Browse Source 
Fixes GH-1804
This commit is contained in:
Zach Brown
2019-04-05 00:52:02 -04:00
parent 58185a044c
commit 401cd58e70
55 changed files with 264 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0294-Duplicate-UUID-Resolve-Option.patch
View File

@@ -1,4 +1,4 @@
From 33a0b942620f80702dcbea1008f0c043250a26d3 Mon Sep 17 00:00:00 2001
From 839b6ba6410971ca20b19a8b881aa451b3ba97b3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 21 Jul 2018 14:27:34 -0400
Subject: [PATCH] Duplicate UUID Resolve Option
@@ -33,10 +33,10 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 92acfa6fb..05509e4fd 100644
index 471a8d6f0..9cdc63a03 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -454,4 +454,43 @@ public class PaperWorldConfig {
@@ -462,4 +462,43 @@ public class PaperWorldConfig {
log("Bed Search Radius: " + bedSearchRadius);
}
}
@@ -163,7 +163,7 @@ index 1c1f39524..edae53b82 100644
// CraftBukkit start
List<Entity> toRemove = new LinkedList<>();
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 58122bfcc..a64a02fd4 100644
index 0b23b5af9..f4cdf7548 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2736,6 +2736,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke