From b54355136504383e6454ad40d7247182bfc2a0a3 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 10 Sep 2014 20:49:42 -0500 Subject: [PATCH] Don't register standing or wall banner, and daylight detector inverted Cause client crashes, likely because they arent ticking yet --- .../0041-Implement-a-few-1.8-features.patch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Spigot-Server-Patches/0041-Implement-a-few-1.8-features.patch b/Spigot-Server-Patches/0041-Implement-a-few-1.8-features.patch index 9e501a401a..3d6ec2aa4f 100644 --- a/Spigot-Server-Patches/0041-Implement-a-few-1.8-features.patch +++ b/Spigot-Server-Patches/0041-Implement-a-few-1.8-features.patch @@ -1,4 +1,4 @@ -From ffe49c3d17d1d1fb36e483d72f25c20684bd25a9 Mon Sep 17 00:00:00 2001 +From 35fc47f5ef31cf675667041464cecd794ffaa74e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 7 Sep 2014 15:45:58 -0500 Subject: [PATCH] Implement a few 1.8 features @@ -6,7 +6,7 @@ Subject: [PATCH] Implement a few 1.8 features Blocks, items, few odds and ends diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 24e84d6..8c50956 100644 +index 24e84d6..af51fc6 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -21,6 +21,7 @@ public class Block { @@ -26,7 +26,7 @@ index 24e84d6..8c50956 100644 REGISTRY.a(152, "redstone_block", (new BlockRedstone(MaterialMapColor.f)).c(5.0F).b(10.0F).a(j).c("blockRedstone").d("redstone_block")); REGISTRY.a(153, "quartz_ore", (new BlockOre()).c(3.0F).b(5.0F).a(i).c("netherquartz").d("quartz_ore")); REGISTRY.a(154, "hopper", (new BlockHopper()).c(3.0F).b(8.0F).a(f).c("hopper").d("hopper")); -@@ -278,12 +279,44 @@ public class Block { +@@ -278,12 +279,45 @@ public class Block { REGISTRY.a(162, "log2", (new BlockLog2()).c("log").d("log")); REGISTRY.a(163, "acacia_stairs", (new BlockStairs(block1, 4)).c("stairsWoodAcacia")); REGISTRY.a(164, "dark_oak_stairs", (new BlockStairs(block1, 5)).c("stairsWoodDarkOak")); @@ -44,9 +44,10 @@ index 24e84d6..8c50956 100644 REGISTRY.a(174, "packed_ice", (new BlockPackedIce()).c(0.5F).a(k).c("icePacked").d("ice_packed")); REGISTRY.a(175, "double_plant", new BlockTallPlant()); + // PaperSpigot start - More new 1.8 blocks -+ REGISTRY.a(176, "standing_banner", (new BlockStationary(Material.WOOL)).c(1.0F).a(f).c("banner")); -+ REGISTRY.a(177, "wall_banner", (new BlockStationary(Material.WOOL)).c(1.0F).a(f).c("banner")); -+ REGISTRY.a(178, "daylight_detector_inverted", new BlockDaylightDetector(true)); ++ // Yank TEs as they cause the client to crash at this time ++ //REGISTRY.a(176, "standing_banner", (new BlockStationary(Material.WOOL)).c(1.0F).a(f).c("banner")); ++ //REGISTRY.a(177, "wall_banner", (new BlockStationary(Material.WOOL)).c(1.0F).a(f).c("banner")); ++ //REGISTRY.a(178, "daylight_detector_inverted", new BlockDaylightDetector(true)); + Block block12 = (new BlockSandStone()).a(i).c(0.8F).c("redSandStone"); + REGISTRY.a(179, "red_sandstone", block12); + REGISTRY.a(180, "red_sandstone_stairs", (new BlockStairs(block12, 0).c("stairsRedSandStone")));