mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 06:58:11 +02:00
a0b8b886c8
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
CraftBukkit Changes:
d5a72960 SPIGOT-6063: ConsoleSender sending extra lines in Java 13+
Spigot Changes:
2740d5ae Rebuild patches
24 lines
1.1 KiB
Diff
24 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 15 Aug 2020 09:32:00 -0500
|
|
Subject: [PATCH] Fix incorrect return for WorldServer#addAllEntitiesSafely
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
|
index 4b8b0973c3d5765b276e8ae27062bc0d9d048120..aa55c72afa6e10f6b50f42e4a6acc69ba340ac09 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -1257,7 +1257,11 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
|
if (entity.co().anyMatch(this::isUUIDTaken)) {
|
|
return false;
|
|
} else {
|
|
- return this.addAllEntities(entity, reason); // CraftBukkit
|
|
+ // Paper start - this method is _only_ designed to return false on duplicate uuids
|
|
+ // fixes issues with things such as a plugin cancelling spawn of a /summon
|
|
+ this.addAllEntities(entity, reason); // CraftBukkit
|
|
+ return true;
|
|
+ // Paper end
|
|
}
|
|
}
|
|
|