From ef099d2812fbcfb72d474c5643520d1d06808ec7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 19 Jul 2018 01:51:01 -0400 Subject: [PATCH] Update master patches just merged to 1.13 --- ...e-the-Entity-Random-seed-for-squids.patch} | 8 +++---- ...illa-entity-warnings-for-duplicates.patch} | 18 +++++++-------- .../0295-add-uuid-to-Entity.toString.patch | 22 +++++++++++++++++++ ...pawn-if-entity-is-in-a-chunk-schedu.patch} | 6 ++--- .../0332-add-uuid-to-Entity.toString.patch | 22 ------------------- 5 files changed, 38 insertions(+), 38 deletions(-) rename Spigot-Server-Patches/{0330-Don-t-change-the-Entity-Random-seed-for-squids.patch => 0293-Don-t-change-the-Entity-Random-seed-for-squids.patch} (76%) rename Spigot-Server-Patches/{0331-Re-add-vanilla-entity-warnings-for-duplicates.patch => 0294-Re-add-vanilla-entity-warnings-for-duplicates.patch} (62%) create mode 100644 Spigot-Server-Patches/0295-add-uuid-to-Entity.toString.patch rename Spigot-Server-Patches/{0333-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch => 0296-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch} (87%) delete mode 100644 Spigot-Server-Patches/0332-add-uuid-to-Entity.toString.patch diff --git a/Spigot-Server-Patches/0330-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0293-Don-t-change-the-Entity-Random-seed-for-squids.patch similarity index 76% rename from Spigot-Server-Patches/0330-Don-t-change-the-Entity-Random-seed-for-squids.patch rename to Spigot-Server-Patches/0293-Don-t-change-the-Entity-Random-seed-for-squids.patch index 67c79ad78..c9a9a9a54 100644 --- a/Spigot-Server-Patches/0330-Don-t-change-the-Entity-Random-seed-for-squids.patch +++ b/Spigot-Server-Patches/0293-Don-t-change-the-Entity-Random-seed-for-squids.patch @@ -1,20 +1,20 @@ -From ae198e0c01788ecbf9eee5d0602ddd9393f41b7c Mon Sep 17 00:00:00 2001 +From c7a2c715e0925f5129d329923893d2b3ec42c530 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 19 Jul 2018 01:05:00 -0400 Subject: [PATCH] Don't change the Entity Random seed for squids diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index 58a902831..2d8cfb012 100644 +index 70b251210..0114d585b 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -22,7 +22,7 @@ public class EntitySquid extends EntityWaterAnimal { public EntitySquid(World world) { - super(world); + super(EntityTypes.SQUID, world); this.setSize(0.8F, 0.8F); - this.random.setSeed((long) (1 + this.getId())); + //this.random.setSeed((long) (1 + this.getId())); // Paper - this.bB = 1.0F / (this.random.nextFloat() + 1.0F) * 0.2F; + this.bI = 1.0F / (this.random.nextFloat() + 1.0F) * 0.2F; } -- diff --git a/Spigot-Server-Patches/0331-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0294-Re-add-vanilla-entity-warnings-for-duplicates.patch similarity index 62% rename from Spigot-Server-Patches/0331-Re-add-vanilla-entity-warnings-for-duplicates.patch rename to Spigot-Server-Patches/0294-Re-add-vanilla-entity-warnings-for-duplicates.patch index 8e404b650..c8ee179e6 100644 --- a/Spigot-Server-Patches/0331-Re-add-vanilla-entity-warnings-for-duplicates.patch +++ b/Spigot-Server-Patches/0294-Re-add-vanilla-entity-warnings-for-duplicates.patch @@ -1,4 +1,4 @@ -From 5bcdb8659896fe78904ecdd15d38ea2a483204d0 Mon Sep 17 00:00:00 2001 +From 9f56f07c54c891e59a6eb024f9f5df8426c00a85 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 19 Jul 2018 01:08:05 -0400 Subject: [PATCH] Re-add vanilla entity warnings for duplicates @@ -8,24 +8,24 @@ These are a critical sign that somethin went wrong, and you've lost some data... We should kind of know about these things you know. diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 9fe5c4406..dd78a87b2 100644 +index d6d3ffa6f..2c5004e61 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -1159,7 +1159,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { +@@ -979,7 +979,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { private boolean j(Entity entity) { if (entity.dead) { -- // WorldServer.a.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.a(entity)); // CraftBukkit -+ WorldServer.a.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.a(entity)); // CraftBukkit // Paper +- // WorldServer.a.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.P())); // CraftBukkit ++ WorldServer.a.warn("Tried to add entity {} but it was marked as removed already: " + entity); // CraftBukkit // Paper return false; } else { UUID uuid = entity.getUniqueID(); -@@ -1171,7 +1171,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { - this.f.remove(entity1); +@@ -991,7 +991,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { + this.g.remove(entity1); } else { if (!(entity instanceof EntityHuman)) { -- // WorldServer.a.warn("Keeping entity {} that already exists with UUID {}", EntityTypes.a(entity1), uuid.toString()); // CraftBukkit -+ WorldServer.a.error("Keeping entity {} that already exists with UUID {} - " + entity1, EntityTypes.a(entity1), uuid.toString()); // CraftBukkit // Paper +- // WorldServer.a.warn("Keeping entity {} that already exists with UUID {}", EntityTypes.getName(entity1.P()), uuid.toString()); // CraftBukkit ++ WorldServer.a.error("Keeping entity {} that already exists with UUID {} - " + entity1, EntityTypes.getName(entity1.P()), uuid.toString()); // CraftBukkit // Paper + WorldServer.a.error("Deleting duplicate entity {}", entity); // Paper return false; } diff --git a/Spigot-Server-Patches/0295-add-uuid-to-Entity.toString.patch b/Spigot-Server-Patches/0295-add-uuid-to-Entity.toString.patch new file mode 100644 index 000000000..431a824b1 --- /dev/null +++ b/Spigot-Server-Patches/0295-add-uuid-to-Entity.toString.patch @@ -0,0 +1,22 @@ +From fac0d56990f254da4f1a4b51310eaf047c9cea13 Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Thu, 19 Jul 2018 01:13:28 -0400 +Subject: [PATCH] add uuid to Entity.toString() + + +diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java +index ea42800ae..93c34a260 100644 +--- a/src/main/java/net/minecraft/server/Entity.java ++++ b/src/main/java/net/minecraft/server/Entity.java +@@ -2493,7 +2493,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke + } + + public String toString() { +- return String.format(Locale.ROOT, "%s[\'%s\'/%d, l=\'%s\', x=%.2f, y=%.2f, z=%.2f]", new Object[] { this.getClass().getSimpleName(), this.getDisplayName().getText(), Integer.valueOf(this.id), this.world == null ? "~NULL~" : this.world.getWorldData().getName(), Double.valueOf(this.locX), Double.valueOf(this.locY), Double.valueOf(this.locZ)}); ++ return String.format(Locale.ROOT, "%s[\'%s\'/%d, uuid=\'%s\', l=\'%s\', x=%.2f, y=%.2f, z=%.2f]", new Object[] { this.getClass().getSimpleName(), this.getDisplayName().getText(), Integer.valueOf(this.id), this.uniqueID.toString(), this.world == null ? "~NULL~" : this.world.getWorldData().getName(), Double.valueOf(this.locX), Double.valueOf(this.locY), Double.valueOf(this.locZ)}); // Paper - add uuid + } + + public boolean isInvulnerable(DamageSource damagesource) { +-- +2.18.0 + diff --git a/Spigot-Server-Patches/0333-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch b/Spigot-Server-Patches/0296-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch similarity index 87% rename from Spigot-Server-Patches/0333-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch rename to Spigot-Server-Patches/0296-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch index fe12267e0..16803aeb0 100644 --- a/Spigot-Server-Patches/0333-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch +++ b/Spigot-Server-Patches/0296-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch @@ -1,4 +1,4 @@ -From 4b0d74a924803d09ea2ba1e95f38afc4de96d86f Mon Sep 17 00:00:00 2001 +From d826de1e7aa6bc2cd8e10f847e3617cbc895084e Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 19 Jul 2018 01:23:00 -0400 Subject: [PATCH] Don't process despawn if entity is in a chunk scheduled for @@ -12,10 +12,10 @@ keep it vanilla in behavior a player may teleport away, and trigger instant despawn diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 89e878365..d6a1933ad 100644 +index 9dc86e90d..c03eaf1e4 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java -@@ -628,6 +628,8 @@ public abstract class EntityInsentient extends EntityLiving { +@@ -617,6 +617,8 @@ public abstract class EntityInsentient extends EntityLiving { if (this.persistent) { this.ticksFarFromPlayer = 0; } else { diff --git a/Spigot-Server-Patches/0332-add-uuid-to-Entity.toString.patch b/Spigot-Server-Patches/0332-add-uuid-to-Entity.toString.patch deleted file mode 100644 index bddd131a9..000000000 --- a/Spigot-Server-Patches/0332-add-uuid-to-Entity.toString.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 9b99af87d227e67cfc13b271b7b1b9d6dc37e45c Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Thu, 19 Jul 2018 01:13:28 -0400 -Subject: [PATCH] add uuid to Entity.toString() - - -diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index d03e7c24f..fe1ccba8d 100644 ---- a/src/main/java/net/minecraft/server/Entity.java -+++ b/src/main/java/net/minecraft/server/Entity.java -@@ -2348,7 +2348,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper - } - - public String toString() { -- return String.format("%s[\'%s\'/%d, l=\'%s\', x=%.2f, y=%.2f, z=%.2f]", new Object[] { this.getClass().getSimpleName(), this.getName(), Integer.valueOf(this.id), this.world == null ? "~NULL~" : this.world.getWorldData().getName(), Double.valueOf(this.locX), Double.valueOf(this.locY), Double.valueOf(this.locZ)}); -+ return String.format("%s[\'%s\'/%d, uuid=\'%s\', l=\'%s\', x=%.2f, y=%.2f, z=%.2f]", new Object[] { this.getClass().getSimpleName(), this.getName(), Integer.valueOf(this.id), this.uniqueID.toString(), this.world == null ? "~NULL~" : this.world.getWorldData().getName(), Double.valueOf(this.locX), Double.valueOf(this.locY), Double.valueOf(this.locZ)}); // Paper - add UUID - } - - public boolean isInvulnerable(DamageSource damagesource) { --- -2.18.0 -