Merge branch 'master' into pre/1.13
* master: fix missed break statement and enum check on dupe uuid resolve
This commit is contained in:
commit
751317f21b
|
@ -1,4 +1,4 @@
|
||||||
From 0df97ae8dc5deef81b75512e44b935f2e01404b7 Mon Sep 17 00:00:00 2001
|
From d54ed04c17db7c5aab315cb20b533fcb5e219a36 Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sat, 21 Jul 2018 14:27:34 -0400
|
Date: Sat, 21 Jul 2018 14:27:34 -0400
|
||||||
Subject: [PATCH] Duplicate UUID Resolve Option
|
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.
|
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
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||||
index 7bd7aa0d94..50d3483eb0 100644
|
index 7bd7aa0d94..809441fc63 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
|
||||||
@@ -430,4 +430,44 @@ public class PaperWorldConfig {
|
@@ -430,4 +430,45 @@ public class PaperWorldConfig {
|
||||||
log("Bed Search Radius: " + bedSearchRadius);
|
log("Bed Search Radius: " + bedSearchRadius);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -52,6 +52,7 @@ index 7bd7aa0d94..50d3483eb0 100644
|
||||||
+ case "saferegenerate":
|
+ case "saferegenerate":
|
||||||
+ duplicateUUIDMode = DuplicateUUIDMode.SAFE_REGEN;
|
+ duplicateUUIDMode = DuplicateUUIDMode.SAFE_REGEN;
|
||||||
+ log("Duplicate UUID Resolve: Safer Regenerate New UUID (Delete likely duplicates)");
|
+ log("Duplicate UUID Resolve: Safer Regenerate New UUID (Delete likely duplicates)");
|
||||||
|
+ break;
|
||||||
+ case "regen":
|
+ case "regen":
|
||||||
+ case "regenerate":
|
+ case "regenerate":
|
||||||
+ duplicateUUIDMode = DuplicateUUIDMode.REGEN;
|
+ duplicateUUIDMode = DuplicateUUIDMode.REGEN;
|
||||||
|
@ -82,7 +83,7 @@ index 7bd7aa0d94..50d3483eb0 100644
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||||
index 1997cbdc65..2838f4e822 100644
|
index 1997cbdc65..a593a798c9 100644
|
||||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||||
@@ -1,5 +1,10 @@
|
@@ -1,5 +1,10 @@
|
||||||
|
@ -118,7 +119,7 @@ index 1997cbdc65..2838f4e822 100644
|
||||||
List entityslice = aentityslice[j]; // Spigot
|
List entityslice = aentityslice[j]; // Spigot
|
||||||
+ // Paper start
|
+ // Paper start
|
||||||
+ DuplicateUUIDMode mode = world.paperConfig.duplicateUUIDMode;
|
+ DuplicateUUIDMode mode = world.paperConfig.duplicateUUIDMode;
|
||||||
+ if (mode == DuplicateUUIDMode.WARN | mode == DuplicateUUIDMode.DELETE || mode == DuplicateUUIDMode.REGEN) {
|
+ if (mode == DuplicateUUIDMode.WARN | mode == DuplicateUUIDMode.DELETE || mode == DuplicateUUIDMode.REGEN || mode == DuplicateUUIDMode.SAFE_REGEN) {
|
||||||
+ Map<UUID, Entity> thisChunk = new HashMap<>();
|
+ Map<UUID, Entity> thisChunk = new HashMap<>();
|
||||||
+ for (Iterator<Entity> iterator = ((List<Entity>) entityslice).iterator(); iterator.hasNext(); ) {
|
+ for (Iterator<Entity> iterator = ((List<Entity>) entityslice).iterator(); iterator.hasNext(); ) {
|
||||||
+ Entity entity = iterator.next();
|
+ Entity entity = iterator.next();
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From ed36f876be22fd9feaf46b86d2f69971d513158d Mon Sep 17 00:00:00 2001
|
From 58d0f47f63481d1f00a5aa9628248cb1e77e58ef Mon Sep 17 00:00:00 2001
|
||||||
From: Aikar <aikar@aikar.co>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Sat, 21 Apr 2018 11:21:48 -0400
|
Date: Sat, 21 Apr 2018 11:21:48 -0400
|
||||||
Subject: [PATCH] Configurable Allowance of Permanent Chunk Loaders
|
Subject: [PATCH] Configurable Allowance of Permanent Chunk Loaders
|
||||||
|
@ -7,10 +7,10 @@ This disables the behavior that allows players to keep chunks permanently loaded
|
||||||
by default and allows server operators to enable it if they wish.
|
by default and allows server operators to enable it if they wish.
|
||||||
|
|
||||||
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 50d3483eb0..5b14973810 100644
|
index 809441fc63..4a135d84db 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
|
||||||
@@ -470,4 +470,9 @@ public class PaperWorldConfig {
|
@@ -471,4 +471,9 @@ public class PaperWorldConfig {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue