Upstream/FastAsyncWorldedit
1
0
Fork 0
mirror of https://github.com/boy0001/FastAsyncWorldedit.git synced 2024-11-28 21:56:33 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/boy0001/FastAsyncWorldedit

Browse Source
This commit is contained in:
Jesse Boyd 2017-06-09 17:09:05 +10:00
commit da3f1eabda
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/src/main/java/com/boydti/fawe/bukkit/v1_12/NMSRegistryDumper.java
View File

@ -239,7 +239,7 @@ public class NMSRegistryDumper {
map.put("unpushable", m.getPushReaction() == EnumPistonReaction.BLOCK); map.put("unpushable", m.getPushReaction() == EnumPistonReaction.BLOCK);
map.put("adventureModeExempt", getField(m, Material.class, "isAdventureModeExempt", "Q")); map.put("adventureModeExempt", getField(m, Material.class, "isAdventureModeExempt", "Q"));
//map.put("mapColor", rgb(m.getMaterialMapColor().colorValue)); //map.put("mapColor", rgb(m.getMaterialMapColor().colorValue));
map.put("ambientOcclusionLightValue", b.s(bs) ? 0.2F:1.0F); map.put("ambientOcclusionLightValue", b.isOccluding(bs) ? 0.2F:1.0F);
map.put("grassBlocking", false); // idk what this property was originally supposed to be...grass uses a combination of light values to check growth map.put("grassBlocking", false); // idk what this property was originally supposed to be...grass uses a combination of light values to check growth
return map; return map;
} }

2
nukkit/src/main/java/com/boydti/fawe/nukkit/listener/BrushListener.java
View File

@ -76,7 +76,7 @@ public class BrushListener implements Listener {
public void onPlayerInteract(final PlayerInteractEvent event) { public void onPlayerInteract(final PlayerInteractEvent event) {
Player nukkitPlayer = event.getPlayer(); Player nukkitPlayer = event.getPlayer();
if (nukkitPlayer.isSneaking()) { if (nukkitPlayer.isSneaking()) {
if (event.getAction() == PlayerInteractEvent.PHYSICAL) { if (event.getAction() == PlayerInteractEvent.Action.PHYSICAL) {
return; return;
} }
FawePlayer<Object> fp = FawePlayer.wrap(nukkitPlayer); FawePlayer<Object> fp = FawePlayer.wrap(nukkitPlayer);