Repo-Mirror/SparklyPaperMC
9
0
Fork 0
mirror of https://github.com/SparklyPower/SparklyPaper.git synced 2025-12-24 01:19:30 +00:00
Code Issues Releases Activity

Update patches

Browse Source
This commit is contained in:
MrPowerGamerBR
2021-07-09 10:51:52 -03:00
parent 4eef797cf1
commit 8abb9117c8
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0001-new-fork-who-dis-Rebrand-to-SparklyPaper.patch
View File

@@ -27,10 +27,10 @@ index ab8de6c4e3c0bea2b9f498da00adf88e987d2364..8fc6315cf8afa10866f7a15c7a02f0d8
"Specification-Title" to "Bukkit", "Specification-Title" to "Bukkit",
"Specification-Version" to project.version, "Specification-Version" to project.version,
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f3bf6270c7735869083559f907c65d95144dbe6f..c16b276f69b6a2302dc52e3d10df1f4c825ff097 100644 index f25bb4214cffd0050241ea229b6acb0c16b2b0a5..c5390c532b62042c81103c750af6e88bbc5d3d88 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1714,7 +1714,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa @@ -1716,7 +1716,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate @DontObfuscate
public String getServerModName() { public String getServerModName() {
@@ -38,9 +38,9 @@ index f3bf6270c7735869083559f907c65d95144dbe6f..c16b276f69b6a2302dc52e3d10df1f4c
+ return "SparklyPaper"; // SparklyPaper - SparklyPaper > // Tuinity - Tuinity > //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! + return "SparklyPaper"; // SparklyPaper - SparklyPaper > // Tuinity - Tuinity > //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
} }
public SystemReport fillSystemReport(SystemReport systemreport) { public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 130a088e694b85f7d56620352f044161ea56caf3..29eb6d5c43871ef7d6479864178e3b6e015903f8 100644 index 4342bc5aad49fe372d561296a6b63818a443d089..1250780c864052fe6b9876d74398121e38861346 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper @@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper

8
patches/server/0005-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
View File

@@ -27,10 +27,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 57c448ee93df76fc2a17c75fafc78408d720ced3..5973dcbfc7dbb532222dc5856ed3df3fc9e55a1f 100644 index ed745776316c5346ee1b44c8f022c40359b7e642..402b785b5fd0e1c3c5c02505dca332990ec64e37 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3425,7 +3425,10 @@ public abstract class LivingEntity extends Entity { @@ -3428,7 +3428,10 @@ public abstract class LivingEntity extends Entity {
Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ()); Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
// Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists
@@ -64,10 +64,10 @@ index ec781ab232d12cedb5f0236860377c4917c576d7..ced4b354e83ad68f8f1aacdefe2f0ce0
default BlockHitResult rayTraceBlock(ClipContext raytrace1, BlockPos blockposition) { default BlockHitResult rayTraceBlock(ClipContext raytrace1, BlockPos blockposition) {
// Paper start - Prevent raytrace from loading chunks // Paper start - Prevent raytrace from loading chunks
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 38753e10b1597a2f3bd2cde208c6e30b26a03b43..6c23d666063472885a414fa89fa6bf5229bae620 100644 index 61a4dea715689b0ce9247040db5dd2080ee2e167..a2bb8eee5ef4a5043026af20f78bb43a5006e6b4 100644
--- a/src/main/java/net/minecraft/world/level/Level.java --- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -452,6 +452,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -453,6 +453,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
return null; return null;
} }

6
patches/server/0009-Optimize-random-calls-in-chunk-ticking.patch
View File

@@ -34,10 +34,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index 958b7044c196ebd66f60391c33c64ad2ff82d4e8..5b8f23b7739580b8a08de0ed43c0fc01ab245e30 100644 index db39671881b622189961b39309a323a1b35d680e..5309e9060766c6f16bce6156c6d84e26b1dbb6b1 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -982,6 +982,7 @@ public class ServerChunkCache extends ChunkSource { @@ -981,6 +981,7 @@ public class ServerChunkCache extends ChunkSource {
} }
// Paper end - optimize isOutisdeRange // Paper end - optimize isOutisdeRange
this.level.getProfiler().push("pollingChunks"); this.level.getProfiler().push("pollingChunks");
@@ -46,7 +46,7 @@ index 958b7044c196ebd66f60391c33c64ad2ff82d4e8..5b8f23b7739580b8a08de0ed43c0fc01
boolean flag2 = level.ticksPerAnimalSpawns != 0L && worlddata.getGameTime() % level.ticksPerAnimalSpawns == 0L; // CraftBukkit boolean flag2 = level.ticksPerAnimalSpawns != 0L && worlddata.getGameTime() % level.ticksPerAnimalSpawns == 0L; // CraftBukkit
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 57163e3cb883ded5861e57c3ca03663c02ee7492..937888b9c36a5bfaf661bfd740b12a634558f527 100644 index 7642170bf5a0eaa11110238fa5cf1a7e1ff20a20..bb51d9c842a3b1bc517b378194c61a6c30b629c3 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -881,6 +881,8 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl @@ -881,6 +881,8 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl

8
patches/server/0017-Cache-climbing-check-for-activation.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Cache climbing check for activation
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 5973dcbfc7dbb532222dc5856ed3df3fc9e55a1f..f59aabf306c3ffed4a5f34dcb434750abe7b461a 100644 index 402b785b5fd0e1c3c5c02505dca332990ec64e37..c22bf8f7df311ae3f2973667764e9768bcc9065d 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -16,7 +16,7 @@ index 5973dcbfc7dbb532222dc5856ed3df3fc9e55a1f..f59aabf306c3ffed4a5f34dcb434750a
public abstract class LivingEntity extends Entity { public abstract class LivingEntity extends Entity {
@@ -1820,6 +1819,20 @@ public abstract class LivingEntity extends Entity { @@ -1824,6 +1823,20 @@ public abstract class LivingEntity extends Entity {
return this.lastClimbablePos; return this.lastClimbablePos;
} }
@@ -38,10 +38,10 @@ index 5973dcbfc7dbb532222dc5856ed3df3fc9e55a1f..f59aabf306c3ffed4a5f34dcb434750a
if (this.isSpectator()) { if (this.isSpectator()) {
return false; return false;
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 7361bf04de16d0526dc4cdbd0f564713df041d90..eb1206bcbdbd47abc0d58bf014001d98a24007ab 100644 index 966639cc6ba6684bfb52e91ac047808cf4d003e4..6d1ed4bf941610fb9210a32f944a4b916527138f 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java --- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -270,7 +270,7 @@ public class ActivationRange @@ -276,7 +276,7 @@ public class ActivationRange
if ( entity instanceof LivingEntity ) if ( entity instanceof LivingEntity )
{ {
LivingEntity living = (LivingEntity) entity; LivingEntity living = (LivingEntity) entity;

6
patches/server/0026-Remove-streams-and-iterators-from-range-check.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Remove streams and iterators from range check
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 509a4239dbda8d8d7edebfdc92bed84a13def369..3ffae739c4bf7f7f6f0ae13c0d716ae6a292ebfd 100644 index b9b985268f5627a238c302f81400a05bfd7c592d..c82ae84190273609b0f5f533eb41a0e5363c16bf 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -2438,8 +2438,28 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially @@ -2453,8 +2453,28 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance); return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance);
} }
@@ -37,7 +37,7 @@ index 509a4239dbda8d8d7edebfdc92bed84a13def369..3ffae739c4bf7f7f6f0ae13c0d716ae6
Iterator iterator = this.entity.getIndirectPassengers().iterator(); Iterator iterator = this.entity.getIndirectPassengers().iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
@@ -2451,6 +2471,9 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially @@ -2466,6 +2486,9 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
i = j; i = j;
} }
} }

6
patches/server/0031-Remove-lambda-from-ticking-guard.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Remove lambda from ticking guard
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index da4f0dc296c674e3ec393a724f6e2e595da536a0..e182ec1031608d92e59a50ca241762e761dc9e2b 100644 index b714fd0ca551e6c98b351de6e9e6fc16b220be7c..6a1d9793d39eca96241bfd216745841a52b91e29 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -833,7 +833,20 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl @@ -833,7 +833,20 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -31,10 +31,10 @@ index da4f0dc296c674e3ec393a724f6e2e595da536a0..e182ec1031608d92e59a50ca241762e7
} }
} }
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 6c23d666063472885a414fa89fa6bf5229bae620..48530e8374b36f6202a0aa18c5a9211a714df30a 100644 index a2bb8eee5ef4a5043026af20f78bb43a5006e6b4..08973ad1d8699f4957957bbad4fdd4eb01ea3169 100644
--- a/src/main/java/net/minecraft/world/level/Level.java --- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1068,13 +1068,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -1073,13 +1073,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
try { try {
tickConsumer.accept(entity); tickConsumer.accept(entity);
MinecraftServer.getServer().executeMidTickTasks(); // Tuinity - execute chunk tasks mid tick MinecraftServer.getServer().executeMidTickTasks(); // Tuinity - execute chunk tasks mid tick