core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0236-Prevent-Frosted-Ice-fr...

33 lines
1.9 KiB
Diff
Raw Normal View History

More improvements to activation range, improve turtles 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
2018-10-05 03:18:46 +00:00
From 0337ec68f7397efe5c6599cb488ae42952f290a8 Mon Sep 17 00:00:00 2001
NOT FINISHED! 1.13 pre-7 - Holy moley, more patches! Really, don't touch! may harm your cat!
2018-07-18 18:55:52 +00:00
From: Aikar <aikar@aikar.co>
Date: Sat, 10 Mar 2018 16:33:15 -0500
Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks
diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-08-31 22:56:57 +00:00
index 7bea86f52b..ea3a6f2fb1 100644
NOT FINISHED! 1.13 pre-7 - Holy moley, more patches! Really, don't touch! may harm your cat!
2018-07-18 18:55:52 +00:00
--- a/src/main/java/net/minecraft/server/BlockIceFrost.java
+++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-08-31 22:56:57 +00:00
@@ -16,7 +16,8 @@ public class BlockIceFrost extends BlockIce {
try (BlockPosition.b blockposition$b = BlockPosition.b.r()) {
for(EnumDirection enumdirection : EnumDirection.values()) {
blockposition$b.j(blockposition).d(enumdirection);
- IBlockData iblockdata1 = world.getType(blockposition$b);
+ IBlockData iblockdata1 = world.getTypeIfLoaded(blockposition$b); // Paper - don't load chunks
+ if (iblockdata1 == null) continue; // Paper
if (iblockdata1.getBlock() == this && !this.c(iblockdata1, world, blockposition$b)) {
world.J().a(blockposition$b, this, MathHelper.nextInt(random, world.paperConfig.frostedIceDelayMin, world.paperConfig.frostedIceDelayMax)); // Paper - use configurable min/max delay
}
@@ -53,7 +54,7 @@ public class BlockIceFrost extends BlockIce {
try (BlockPosition.b blockposition$b = BlockPosition.b.r()) {
for(EnumDirection enumdirection : EnumDirection.values()) {
blockposition$b.j(blockposition).d(enumdirection);
- if (iblockaccess.getType(blockposition$b).getBlock() == this) {
+ if (((World) iblockaccess).getBlockIfLoaded(blockposition$b) == this) { // Paper - don't load chunks
NOT FINISHED! 1.13 pre-7 - Holy moley, more patches! Really, don't touch! may harm your cat!
2018-07-18 18:55:52 +00:00
++j;
if (j >= i) {
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-08-31 22:56:57 +00:00
boolean flag = false;
NOT FINISHED! 1.13 pre-7 - Holy moley, more patches! Really, don't touch! may harm your cat!
2018-07-18 18:55:52 +00:00
--
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes: 1cf8b5dc SPIGOT-4400: Populators running on existing chunks 116cb9a1 SPIGOT-4399: Add attribute modifier equality test 5ee1c18a SPIGOT-4398: Set ASM7_EXPERIMENTAL flag
2018-09-28 23:31:59 +00:00
2.19.0
NOT FINISHED! 1.13 pre-7 - Holy moley, more patches! Really, don't touch! may harm your cat!
2018-07-18 18:55:52 +00:00