Skip to content

Commit

Permalink
Fixed NCP interfering with SignCopier.
Browse files Browse the repository at this point in the history
  • Loading branch information
me4502 committed May 22, 2017
1 parent 5d4923e commit e93b501
Showing 1 changed file with 4 additions and 1 deletion.
Expand Up @@ -3,6 +3,7 @@
import com.sk89q.craftbook.AbstractCraftBookMechanic; import com.sk89q.craftbook.AbstractCraftBookMechanic;
import com.sk89q.craftbook.LocalPlayer; import com.sk89q.craftbook.LocalPlayer;
import com.sk89q.craftbook.bukkit.CraftBookPlugin; import com.sk89q.craftbook.bukkit.CraftBookPlugin;
import com.sk89q.craftbook.util.CompatabilityUtil;
import com.sk89q.craftbook.util.EventUtil; import com.sk89q.craftbook.util.EventUtil;
import com.sk89q.craftbook.util.ItemInfo; import com.sk89q.craftbook.util.ItemInfo;
import com.sk89q.craftbook.util.ProtectionUtil; import com.sk89q.craftbook.util.ProtectionUtil;
Expand Down Expand Up @@ -40,7 +41,7 @@ public void onRightClick(SignClickEvent event) {


if(!EventUtil.passesFilter(event)) return; if(!EventUtil.passesFilter(event)) return;


LocalPlayer player = CraftBookPlugin.inst().wrapPlayer(event.getPlayer()); LocalPlayer player = event.getWrappedPlayer();


if (!player.getHeldItemInfo().equals(item)) return; if (!player.getHeldItemInfo().equals(item)) return;


Expand All @@ -66,6 +67,7 @@ public void onRightClick(SignClickEvent event) {
Sign s = (Sign) event.getClickedBlock().getState(); Sign s = (Sign) event.getClickedBlock().getState();
String[] lines = signs.get(player.getName()); String[] lines = signs.get(player.getName());


CompatabilityUtil.disableInterferences(event.getPlayer());
SignChangeEvent sev = new SignChangeEvent(event.getClickedBlock(), event.getPlayer(), lines); SignChangeEvent sev = new SignChangeEvent(event.getClickedBlock(), event.getPlayer(), lines);
Bukkit.getPluginManager().callEvent(sev); Bukkit.getPluginManager().callEvent(sev);


Expand All @@ -74,6 +76,7 @@ public void onRightClick(SignClickEvent event) {
s.setLine(i, lines[i]); s.setLine(i, lines[i]);
s.update(); s.update();
} }
CompatabilityUtil.enableInterferences(event.getPlayer());


player.print("mech.signcopy.paste"); player.print("mech.signcopy.paste");
event.setCancelled(true); event.setCancelled(true);
Expand Down

0 comments on commit e93b501

Please sign in to comment.