Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-06-28 15:44:59 +02:00
Code Issues Projects Releases Wiki Activity

Hey Ivan, why did u forgot to check for .rej files?

Browse Source 
This manouver is gonna cost us 50 years.
This commit is contained in:
Ivan Pekov 2020-09-30 16:41:33 +03:00
parent ef03360a82
commit 239a43721f
No known key found for this signature in database
GPG Key ID: BC975C392D9CA3A3
5 changed files with 38 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
patches/server/0001-Yatopia-Server-Fixes.patch
View File

@ -2500,7 +2500,7 @@ index 3a35169eaf680c45fe42922eb5f0014fa422c31c..00000000000000000000000000000000
- }
- // Spigot Start
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index e9d0915556a00ef949f7010f9ac06d1f9319f4b3..b35e6382ce5e8b07ebe5d7d31d53e14cf7ce2114 100644
index e9d0915556a00ef949f7010f9ac06d1f9319f4b3..8554c3ed2c73e92665a83961c612be250f9b03d1 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -869,11 +869,11 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -2563,17 +2563,33 @@ index e9d0915556a00ef949f7010f9ac06d1f9319f4b3..b35e6382ce5e8b07ebe5d7d31d53e14c
}
this.chunkCheck(entity);
@@ -1332,7 +1332,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
gameprofilerfiller.a(() -> {
return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString();
});
- gameprofilerfiller.c("tickPassenger");
+ //gameprofilerfiller.c("tickPassenger"); // Akarin - remove caller
// Paper start - EAR 2
if (isActive) {
entity1.passengerTick();
@@ -1343,7 +1343,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
entity.syncPositionOf(entity1);
}
// Paper end - EAR 2
- gameprofilerfiller.exit();
+ //gameprofilerfiller.exit(); // Akarin - remove caller
}
this.chunkCheck(entity1);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java.rej b/src/main/java/net/minecraft/server/WorldServer.java.rej
index 72e1528c1250a4b59abed862c8ccb2507a66c862..d62e4a7c698bd9253914bb31c5e6389b67e589b6 100644
deleted file mode 100644
index 72e1528c1250a4b59abed862c8ccb2507a66c862..0000000000000000000000000000000000000000
--- a/src/main/java/net/minecraft/server/WorldServer.java.rej
+++ b/src/main/java/net/minecraft/server/WorldServer.java.rej
@@ -1,70 +1,54 @@
diff a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java (rejected hunks)
+++ /dev/null
@@ -1,70 +0,0 @@
-diff a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java (rejected hunks)
-@@ -887,11 +887,11 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+@@ -924,7 +924,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+ }
+ // CraftBukkit end */
-
- this.N();
- this.b();
-- gameprofilerfiller.exitEnter("chunkSource");
@ -2588,15 +2604,7 @@ index 72e1528c1250a4b59abed862c8ccb2507a66c862..d62e4a7c698bd9253914bb31c5e6389b
- this.nextTickListBlock.b();
-@@ -900,17 +900,17 @@ public class WorldServer extends World implements GeneratorAccessSeed {
- timings.scheduledBlocks.stopTiming(); // Paper
+- gameprofilerfiller.enter("checkDespawn");
++ //gameprofilerfiller.enter("checkDespawn"); // Akarin - remove caller
+ if (!entity.dead) {
+ entity.checkDespawn();
+ // Tuinity start - optimise notify()
+@@ -936,7 +936,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+ // Tuinity end - optimise notify()
+ }
-
- // Tuinity - replace logic
-- gameprofilerfiller.exitEnter("raid");
-+ //gameprofilerfiller.exitEnter("raid"); // Akarin - remove caller
@ -2613,39 +2621,16 @@ index 72e1528c1250a4b59abed862c8ccb2507a66c862..d62e4a7c698bd9253914bb31c5e6389b
-- gameprofilerfiller.exitEnter("entities");
-+ //gameprofilerfiller.exitEnter("entities"); // Akarin - remove caller
- boolean flag3 = true || !this.players.isEmpty() || !this.getForceLoadedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players
+- gameprofilerfiller.exit();
++ //gameprofilerfiller.exit(); // Akarin - remove caller
+ if (entity1 != null) {
+ if (!entity1.dead && entity1.w(entity)) {
+ continue;
+@@ -945,13 +945,13 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+ entity.stopRiding();
+ }
-
- if (flag3) {
-@@ -1049,7 +1049,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
- int k = chunkcoordintpair.e();
- GameProfilerFiller gameprofilerfiller = this.getMethodProfiler();
+- gameprofilerfiller.enter("tick");
++ //gameprofilerfiller.enter("tick"); // Akarin - remove caller
+ if (!entity.dead && !(entity instanceof EntityComplexPart)) {
+ this.a(this::entityJoinedWorld, entity);
+ }
-
-- gameprofilerfiller.enter("thunder");
-+ //gameprofilerfiller.enter("thunder"); // Akarin - remove caller
- final BlockPosition.MutableBlockPosition blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change
+- gameprofilerfiller.exit();
+- gameprofilerfiller.enter("remove");
++ //gameprofilerfiller.exit(); // Akarin - remove caller
++ //gameprofilerfiller.enter("remove"); // Akarin - remove caller
+ if (entity.dead) {
+ this.removeEntityFromChunk(entity);
+ this.entitiesById.remove(entity.getId()); // Tuinity
+@@ -963,7 +963,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+ }
+ // Tuinity end - optimise notify()
-
- if (!this.paperConfig.disableThunder && flag && this.T() && this.random.nextInt(100000) == 0) { // Paper - Disable thunder
-@@ -1284,10 +1284,10 @@ public class WorldServer extends World implements GeneratorAccessSeed {
- gameprofilerfiller.a(() -> {
@ -2655,11 +2640,10 @@ index 72e1528c1250a4b59abed862c8ccb2507a66c862..d62e4a7c698bd9253914bb31c5e6389b
-+ //gameprofilerfiller.c("tickNonPassenger"); // Akarin - remove caller
- entity.tick();
- entity.postTick(); // CraftBukkit
- gameprofilerfiller.exit();
+ //gameprofilerfiller.exit(); // Akarin - remove caller
}
+ timings.entityTick.stopTiming(); // Spigot
-- gameprofilerfiller.exit();
-+ //gameprofilerfiller.exit(); // Akarin - remove caller
- }
-
- this.chunkCheck(entity);
-@@ -1325,9 +1325,9 @@ public class WorldServer extends World implements GeneratorAccessSeed {
- gameprofilerfiller.a(() -> {
@ -2671,15 +2655,7 @@ index 72e1528c1250a4b59abed862c8ccb2507a66c862..d62e4a7c698bd9253914bb31c5e6389b
-- gameprofilerfiller.exit();
-+ //gameprofilerfiller.exit(); // Akarin - remove caller
- }
+@@ -1422,7 +1422,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
+ // Tuinity end
+ }
+
+- this.getMethodProfiler().exit();
++ //this.getMethodProfiler().exit(); // Akarin - remove caller
+ }
+ }
-
- this.chunkCheck(entity1);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 4a7285bd8e9ba3b7ad94c67c1880cc216cea5bc9..b7000990cfbf8116e9c3e98ea8e84e6541a989c8 100644

2
patches/server/0028-Optimize-player-loops-around-weather.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Optimize player loops around weather
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index b35e6382ce5e8b07ebe5d7d31d53e14cf7ce2114..9a60f8e78feaa471fedc284beabad61c71be6462 100644
index 8554c3ed2c73e92665a83961c612be250f9b03d1..e86d439a7a340e31071c5b2f6531abd1537db06d 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -814,12 +814,17 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
patches/server/0034-lithium-collision-optimizations.patch
View File

@ -1069,7 +1069,7 @@ index f9a1f5e92a7559a50dfb72d7455a8fc03dbad25f..3094ce00b3fa5b266f5d0ad0875f160e
} else if (shape instanceof VoxelShapeArray) {
VoxelShapeArray shapeCasted = (VoxelShapeArray)shape;
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 9a60f8e78feaa471fedc284beabad61c71be6462..853d27d0b58df4029c92005fe1f28d2da487522e 100644
index e86d439a7a340e31071c5b2f6531abd1537db06d..00930eeea75758645b173f4bc2fbf635e1d426ba 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -649,8 +649,14 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
patches/server/0038-Load-also-the-chunk-that-you-re-teleporting-to.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Load also the chunk that you're teleporting to
Fixes Tuinity-178
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 853d27d0b58df4029c92005fe1f28d2da487522e..4dd721de1026482e0007cb25166152ed97151a96 100644
index 00930eeea75758645b173f4bc2fbf635e1d426ba..2df0162d70d4d60f05565d22cb4ef69b21f2d4bf 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -225,7 +225,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
patches/server/0045-Fix-LightEngineThreaded-memory-leak.patch
View File

@ -18,7 +18,7 @@ index fd0beefb900c064d3c35a3d2f79f5b7d9c1287bb..4d024a4849b7566c0faba131caab57b4
return this.size == 0 && this.pendingTasks.isEmpty();
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 4dd721de1026482e0007cb25166152ed97151a96..27a25a64bba88a0c97f10b59804825dfa319211d 100644
index 2df0162d70d4d60f05565d22cb4ef69b21f2d4bf..bf5ce30a08899279ab5d0ffe7d7448a2e939e84d 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1786,6 +1786,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {