diff --git a/Tuinity b/Tuinity index 6b221e20..bc370873 160000 --- a/Tuinity +++ b/Tuinity @@ -1 +1 @@ -Subproject commit 6b221e20347786520a7a56d9430d6e5362b9a54e +Subproject commit bc370873043fdda84ce4b471fd1dbeed85b51196 diff --git a/patches/api/0005-Add-NBT-API-as-first-class-lib.patch b/patches/api/0005-Add-NBT-API-as-first-class-lib.patch index c9f6e244..0a32c120 100644 --- a/patches/api/0005-Add-NBT-API-as-first-class-lib.patch +++ b/patches/api/0005-Add-NBT-API-as-first-class-lib.patch @@ -1,4 +1,4 @@ -From f649be2d0b23094e667771a20cf7d5f1ad805ed1 Mon Sep 17 00:00:00 2001 +From 47396928f38ffcd7bee95fe4318cf85220530ccc Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 2 Apr 2020 18:49:56 +0200 Subject: [PATCH] Add NBT-API as first-class lib @@ -11,7 +11,7 @@ Subject: [PATCH] Add NBT-API as first-class lib 4 files changed, 56 insertions(+) diff --git a/pom.xml b/pom.xml -index 1394dbd8f..acf15bcf9 100644 +index 802351820..2b7a733d9 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,11 @@ @@ -38,7 +38,7 @@ index 1394dbd8f..acf15bcf9 100644 -@@ -227,6 +237,12 @@ +@@ -232,6 +242,12 @@ ${project.build.directory}/dependency-reduced-pom.xml true @@ -78,7 +78,7 @@ index 3b10fcc13..acb135968 100644 + // YAPFA end } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 3f0f38031..771e7ea73 100644 +index d4c776f32..a7e5c4090 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -23,6 +23,8 @@ import org.jetbrains.annotations.Contract; @@ -90,7 +90,7 @@ index 3f0f38031..771e7ea73 100644 /** * Represents a base entity in the world */ -@@ -659,4 +661,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -660,4 +662,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason(); // Paper end diff --git a/patches/server/0003-Don-t-save-Fireworks-and-Arrows.patch b/patches/server/0003-Don-t-save-Fireworks-and-Arrows.patch index e594b45a..93446153 100644 --- a/patches/server/0003-Don-t-save-Fireworks-and-Arrows.patch +++ b/patches/server/0003-Don-t-save-Fireworks-and-Arrows.patch @@ -1,4 +1,4 @@ -From e304e94d21624772129ea90152199518dba2eb0e Mon Sep 17 00:00:00 2001 +From ad1958aac77ac13abf4be47aafc7e07aabbf0c96 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Wed, 26 Feb 2020 21:39:58 +0100 Subject: [PATCH] Don't save Fireworks and Arrows @@ -8,10 +8,10 @@ Subject: [PATCH] Don't save Fireworks and Arrows 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 2b9c0105f..b28b668bd 100644 +index 8b1957e81e..ce5048d21d 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1719,7 +1719,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -1722,7 +1722,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke } public boolean a_(NBTTagCompound nbttagcompound) { diff --git a/patches/server/0005-Add-getLastTickMs-api.patch b/patches/server/0005-Add-getLastTickMs-api.patch index f3b20d88..9d17440b 100644 --- a/patches/server/0005-Add-getLastTickMs-api.patch +++ b/patches/server/0005-Add-getLastTickMs-api.patch @@ -1,4 +1,4 @@ -From 24155adba5a1a7cadfcf0a61c3e0d8f77cd8509b Mon Sep 17 00:00:00 2001 +From 3722cb3a76dc7a7ddd12a303935b73d284962179 Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 5 Mar 2020 21:13:33 +0100 Subject: [PATCH] Add getLastTickMs() api @@ -10,7 +10,7 @@ Subject: [PATCH] Add getLastTickMs() api 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e1373f2c0..9bb5e0c98 100644 +index e1373f2c0a..9bb5e0c980 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -933,6 +933,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Thu, 5 Mar 2020 22:31:50 +0100 Subject: [PATCH] Add config, yapfa command and basic settings @@ -15,7 +15,7 @@ Subject: [PATCH] Add config, yapfa command and basic settings diff --git a/src/main/java/de/tr7zw/yapfa/YapfaCommand.java b/src/main/java/de/tr7zw/yapfa/YapfaCommand.java new file mode 100644 -index 000000000..76d83f3db +index 0000000000..76d83f3db4 --- /dev/null +++ b/src/main/java/de/tr7zw/yapfa/YapfaCommand.java @@ -0,0 +1,129 @@ @@ -151,7 +151,7 @@ index 000000000..76d83f3db \ No newline at end of file diff --git a/src/main/java/de/tr7zw/yapfa/YapfaConfig.java b/src/main/java/de/tr7zw/yapfa/YapfaConfig.java new file mode 100644 -index 000000000..35ac0206c +index 0000000000..35ac0206c9 --- /dev/null +++ b/src/main/java/de/tr7zw/yapfa/YapfaConfig.java @@ -0,0 +1,209 @@ @@ -366,7 +366,7 @@ index 000000000..35ac0206c +} \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 34beb503f..86a8d1fa3 100644 +index 34beb503f4..86a8d1fa34 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -7,6 +7,7 @@ import com.mojang.authlib.GameProfileRepository; @@ -394,20 +394,20 @@ index 34beb503f..86a8d1fa3 100644 this.setPVP(dedicatedserverproperties.pvp); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index b28b668bd..06cd0bf51 100644 +index ce5048d21d..06634718a3 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1037,7 +1037,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -1040,7 +1040,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this); VoxelShape voxelshape = this.world.getWorldBorder().c(); - Stream stream = VoxelShapes.c(voxelshape, VoxelShapes.a(axisalignedbb.shrink(1.0E-7D)), OperatorBoolean.AND) ? Stream.empty() : Stream.of(voxelshape); + Stream stream = !this.world.getWorldBorder().isInBounds(axisalignedbb) ? Stream.empty() : Stream.of(voxelshape); // Paper - Stream stream1 = this.world.c(this, axisalignedbb.b(vec3d), (entity) -> { + Stream stream1 = de.tr7zw.yapfa.YapfaConfig.disableEntityCollisionboxes ? Stream.empty() : this.world.c(this, axisalignedbb.b(vec3d), (entity) -> { return true; }); StreamAccumulator streamaccumulator = new StreamAccumulator<>(Stream.concat(stream1, stream)); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 70c2be22b..0b92fda23 100644 +index 70c2be22b7..0b92fda23e 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -266,6 +266,7 @@ public abstract class EntityLiving extends Entity { diff --git a/scripts/upstreamCommit.sh b/scripts/upstreamCommit.sh index 87f37f5f..721699f3 100644 --- a/scripts/upstreamCommit.sh +++ b/scripts/upstreamCommit.sh @@ -5,7 +5,7 @@ PS1="$" function changelog() { base=$(git ls-tree HEAD $1 | cut -d' ' -f3 | cut -f1) - cd $1 && git log --oneline ${base}...ORIGIN/HEAD + cd $1 && git log --oneline ${base}...ORIGIN/ver/1.16 } tuinity=$(changelog Tuinity) #paper=$(changelog Tuinity/Paper)