mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SPIGOT-750: Barrier blocks are transparent for xray purposes

Browse source
This commit is contained in:
md_5 2015-04-09 10:23:32 +10:00 committed by Zach Brown
parent 0091c86379
commit 335170cdb2
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Bukkit-Patches/0006-Add-Particle-API.patch
View file

@ -1,4 +1,4 @@
From 8b3d44e37663dc4ed2dca9f48dc22aa2d4b4a220 Mon Sep 17 00:00:00 2001 From a7cbb7ece394e3385e3d1295a70cfd44c1f51b2b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:57:09 +1000 Date: Sun, 2 Jun 2013 15:57:09 +1000
Subject: [PATCH] Add Particle API Subject: [PATCH] Add Particle API
@ -271,10 +271,10 @@ index 2474a2d..37f29e2 100644
+ public enum Type {SOUND, VISUAL, PARTICLE} + public enum Type {SOUND, VISUAL, PARTICLE}
} }
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index c763abe..e3c6ef4 100644 index 127ad9d..6613286 100644
--- a/src/main/java/org/bukkit/World.java --- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java
@@ -1170,6 +1170,56 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -1183,6 +1183,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/ */
public boolean isGameRule(String rule); public boolean isGameRule(String rule);

6
Bukkit-Patches/0020-Silenceable-Lightning-API.patch
View file

@ -1,14 +1,14 @@
From a988407d71c84e3ef90de14c3ff65a96f9d87c1d Mon Sep 17 00:00:00 2001 From 80d56195bf8bd935740a20322c157d8f92dad9cd Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com> From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:29 -0400 Date: Sun, 23 Feb 2014 16:16:29 -0400
Subject: [PATCH] Silenceable Lightning API Subject: [PATCH] Silenceable Lightning API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index e3c6ef4..4f05aa7 100644 index 6613286..2772b09 100644
--- a/src/main/java/org/bukkit/World.java --- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java
@@ -1215,6 +1215,30 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -1228,6 +1228,30 @@ public interface World extends PluginMessageRecipient, Metadatable {
{ {
throw new UnsupportedOperationException( "Not supported yet." ); throw new UnsupportedOperationException( "Not supported yet." );
} }

6
CraftBukkit-Patches/0053-Orebfuscator.patch
View file

@ -1,4 +1,4 @@
From aeca21a5b37af60031a55ef11c183c736da8750f Mon Sep 17 00:00:00 2001 From a983b605d42d3258b815f5aaf8fe0d25f48d9b4f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Thu, 16 May 2013 18:51:05 +1000 Date: Thu, 16 May 2013 18:51:05 +1000
Subject: [PATCH] Orebfuscator Subject: [PATCH] Orebfuscator
@ -123,7 +123,7 @@ index 51db92b..c1789a0 100644
BlockState previous = it.next(); BlockState previous = it.next();
diff --git a/src/main/java/org/spigotmc/AntiXray.java b/src/main/java/org/spigotmc/AntiXray.java diff --git a/src/main/java/org/spigotmc/AntiXray.java b/src/main/java/org/spigotmc/AntiXray.java
new file mode 100644 new file mode 100644
index 0000000..6f28cd8 index 0000000..7221b50
--- /dev/null --- /dev/null
+++ b/src/main/java/org/spigotmc/AntiXray.java +++ b/src/main/java/org/spigotmc/AntiXray.java
@@ -0,0 +1,234 @@ @@ -0,0 +1,234 @@
@ -358,7 +358,7 @@ index 0000000..6f28cd8
+ // rendering they can be seen through therefor we special + // rendering they can be seen through therefor we special
+ // case them so that the antixray doesn't show the fake + // case them so that the antixray doesn't show the fake
+ // blocks around them. + // blocks around them.
+ return block.isOccluding() && block != Blocks.MOB_SPAWNER; + return block.isOccluding() && block != Blocks.MOB_SPAWNER && block != Blocks.BARRIER;
+ } + }
+} +}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java