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

Default nether void damage to off and allow that

Browse Source
This commit is contained in:
Zach Brown
2019-04-05 01:27:37 -04:00
parent 401cd58e70
commit b963196ed5
67 changed files with 242 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 839b6ba6410971ca20b19a8b881aa451b3ba97b3 Mon Sep 17 00:00:00 2001
From 07a1a16b609fede1a55eef44e09bdb1f7c57e97d 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 471a8d6f0..9cdc63a03 100644
index f5b2e88f3..8c4ff1886 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -462,4 +462,43 @@ public class PaperWorldConfig {
@@ -463,4 +463,43 @@ public class PaperWorldConfig {
log("Bed Search Radius: " + bedSearchRadius);
}
}
@@ -163,10 +163,10 @@ 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 0b23b5af9..f4cdf7548 100644
index ac9fca304..0d3aacf8d 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
@@ -2739,6 +2739,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
});
}