Skip to content

Fix hopper minecarts being able to pull from locked chests #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DeltaWhy wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix hopper minecarts being able to pull from locked chests #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2962705
Fix hopper minecarts being able to pull from locked chests
DeltaWhy May 7, 2013
d837042
Protect double chests from hopper minecarts too
DeltaWhy May 7, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/org/yi/acru/bukkit/Lockette/Lockette.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public class Lockette extends PluginCore{
private static boolean registered = false;
private final LocketteBlockListener blockListener = new LocketteBlockListener(this);
private final LocketteEntityListener entityListener = new LocketteEntityListener(this);
private final LocketteInventoryListener inventoryListener = new LocketteInventoryListener(this);
private final LockettePlayerListener playerListener = new LockettePlayerListener(this);
private final LockettePrefixListener prefixListener = new LockettePrefixListener(this);
private final LocketteWorldListener worldListener = new LocketteWorldListener(this);
Expand Down Expand Up @@ -127,6 +128,7 @@ else if((build >= 685) && (build <= 703)){
if(!registered){
blockListener.registerEvents();
entityListener.registerEvents();
inventoryListener.registerEvents();
playerListener.registerEvents();
prefixListener.registerEvents();
worldListener.registerEvents();
Expand Down Expand Up @@ -395,7 +397,7 @@ protected void loadStrings(boolean reload, String fileName){
// Load in the alternate sign strings.

altPrivate = strings.getString("alternate-private-tag");
if((altPrivate == null) || altPrivate.isEmpty() || (original && altPrivate.equals("Priv�"))){
if((altPrivate == null) || altPrivate.isEmpty() || (original && altPrivate.equals("Priv�"))){
altPrivate = "Private";
strings.set("alternate-private-tag", altPrivate);
}
Expand All @@ -418,7 +420,7 @@ protected void loadStrings(boolean reload, String fileName){
altEveryone = "["+altEveryone+"]";

altOperators = strings.getString("alternate-operators-tag");
if((altOperators == null) || altOperators.isEmpty() || (original && altOperators.equals("Op�rateurs"))){
if((altOperators == null) || altOperators.isEmpty() || (original && altOperators.equals("Op�rateurs"))){
altOperators = "Operators";
strings.set("alternate-operators-tag", altOperators);
stringChanged = true;
Expand Down
57 changes: 57 additions & 0 deletions src/org/yi/acru/bukkit/Lockette/LocketteInventoryListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
package org.yi.acru.bukkit.Lockette;

import org.bukkit.block.BlockState;
import org.bukkit.block.DoubleChest;

import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryMoveItemEvent;

import org.bukkit.inventory.InventoryHolder;

import org.bukkit.plugin.PluginManager;

public class LocketteInventoryListener implements Listener {
private static Lockette plugin;

public LocketteInventoryListener(Lockette instance) {
plugin = instance;
}

protected void registerEvents() {

PluginManager pm = plugin.getServer().getPluginManager();

pm.registerEvents(this, plugin);
}

//********************************************************************************************************************
// Start of event section

@EventHandler(priority = EventPriority.HIGHEST)
public void onInventoryMoveItem(InventoryMoveItemEvent event) {
InventoryHolder sourceHolder = event.getSource().getHolder();
if (sourceHolder instanceof DoubleChest) {
// checking one side is sufficient
sourceHolder = ((DoubleChest)sourceHolder).getLeftSide();
}
if (sourceHolder instanceof BlockState) {
if (Lockette.isProtected( ((BlockState)sourceHolder).getBlock() )) {
event.setCancelled(true);
return;
}
}

InventoryHolder destHolder = event.getDestination().getHolder();
if (destHolder instanceof DoubleChest) {
destHolder = ((DoubleChest)destHolder).getLeftSide();
}
if (destHolder instanceof BlockState) {
if (Lockette.isProtected( ((BlockState)destHolder).getBlock() )) {
event.setCancelled(true);
return;
}
}
}
}