Some more merge fixes

This commit is contained in:
Sn0wStorm
2019-10-12 14:47:01 +02:00
parent 4a1f606e99
commit d355966d42
4 changed files with 3 additions and 4 deletions
+1 -1
View File
@@ -123,7 +123,7 @@ public class Barrel implements InventoryHolder {
// Call event
BarrelAccessEvent accessEvent = new BarrelAccessEvent(this, player, event.getClickedBlock());
// Listened to by WGBarrelNew, WGBarrelOld, GriefPreventionBarrel (IntegrationListener)
// Listened to by WGBarrel7, WGBarrelNew, WGBarrelOld, GriefPreventionBarrel (IntegrationListener)
P.p.getServer().getPluginManager().callEvent(accessEvent);
if (accessEvent.isCancelled()) {
P.p.msg(player, P.p.languageReader.get("Error_NoBarrelAccess"));