mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-09 13:28:36 +02:00
improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From 8d6e913bba8c42ec058c9bee03f22a2f43b4418f Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sun, 5 Feb 2017 19:17:28 -0500
|
|
Subject: [PATCH] Shame on you Mojang
|
|
|
|
Someone wrote some horrible code that throws a world accessing task
|
|
onto the HTTP DOWNLOADER Thread Pool, for an activity that is not even
|
|
heavy enough to warrant async operation.
|
|
|
|
This then triggers async chunk loads!
|
|
|
|
What in the hell were you thinking?
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/BlockBeacon.java b/src/main/java/net/minecraft/server/BlockBeacon.java
|
|
index 7148ea3692..6d4e82b404 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockBeacon.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockBeacon.java
|
|
@@ -46,7 +46,7 @@ public class BlockBeacon extends BlockTileEntity {
|
|
}
|
|
|
|
public static void a(World world, BlockPosition blockposition) {
|
|
- HttpUtilities.a.submit(() -> {
|
|
+ //HttpUtilities.a.submit(() -> { // Paper
|
|
Chunk chunk = world.getChunkAtWorldCoords(blockposition);
|
|
|
|
for(int i = blockposition.getY() - 1; i >= 0; --i) {
|
|
@@ -67,7 +67,6 @@ public class BlockBeacon extends BlockTileEntity {
|
|
});
|
|
}
|
|
}
|
|
-
|
|
- });
|
|
+ // }); // Paper
|
|
}
|
|
}
|
|
--
|
|
2.19.0
|
|
|