Just under 2 months for CB to pull - new record!
By: md_5 <md_5@live.com.au>
This commit is contained in:
+1
-1
@@ -1,4 +1,4 @@
|
||||
From ac46455a052a50c147304066f571414039f9a37a Mon Sep 17 00:00:00 2001
|
||||
From 3a1cdb011335944f41041f928c1a1bb4e088d609 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sun, 2 Jun 2013 15:20:49 +1000
|
||||
Subject: [PATCH] BungeeCord Support
|
||||
@@ -1,73 +0,0 @@
|
||||
From 22f33ad24d44bb233901d9db865edf34b66e33d9 Mon Sep 17 00:00:00 2001
|
||||
From: Tyler Blair <hidendra@griefcraft.com>
|
||||
Date: Tue, 9 Apr 2013 17:53:31 -0300
|
||||
Subject: [PATCH] Enhanced InventoryClickEvent
|
||||
|
||||
Fixes Bukkit-4035. Added in MC 1.5 you can now double click an item which brings all items of that type onto your cursor from the container. There is currently no way to distinguish this from a normal click.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/event/inventory/CraftItemEvent.java b/src/main/java/org/bukkit/event/inventory/CraftItemEvent.java
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
index 264ab0a..6ed1a89
|
||||
--- a/src/main/java/org/bukkit/event/inventory/CraftItemEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/inventory/CraftItemEvent.java
|
||||
@@ -9,7 +9,11 @@ public class CraftItemEvent extends InventoryClickEvent {
|
||||
private Recipe recipe;
|
||||
|
||||
public CraftItemEvent(Recipe recipe, InventoryView what, SlotType type, int slot, boolean right, boolean shift) {
|
||||
- super(what, type, slot, right, shift);
|
||||
+ this(recipe, what, type, slot, right, shift, false);
|
||||
+ }
|
||||
+
|
||||
+ public CraftItemEvent(Recipe recipe, InventoryView what, SlotType type, int slot, boolean right, boolean shift, boolean doubleClick) {
|
||||
+ super(what, type, slot, right, shift, doubleClick);
|
||||
this.recipe = recipe;
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
index 26e1d38..1c07a13
|
||||
--- a/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/inventory/InventoryClickEvent.java
|
||||
@@ -11,17 +11,22 @@ import org.bukkit.inventory.ItemStack;
|
||||
public class InventoryClickEvent extends InventoryEvent implements Cancellable {
|
||||
private static final HandlerList handlers = new HandlerList();
|
||||
private SlotType slot_type;
|
||||
- private boolean rightClick, shiftClick;
|
||||
+ private boolean rightClick, shiftClick, doubleClick;
|
||||
private Result result;
|
||||
private int whichSlot;
|
||||
private int rawSlot;
|
||||
private ItemStack current = null;
|
||||
|
||||
public InventoryClickEvent(InventoryView what, SlotType type, int slot, boolean right, boolean shift) {
|
||||
+ this(what, type, slot, right, shift, false);
|
||||
+ }
|
||||
+
|
||||
+ public InventoryClickEvent(InventoryView what, SlotType type, int slot, boolean right, boolean shift, boolean doubleClick) {
|
||||
super(what);
|
||||
this.slot_type = type;
|
||||
this.rightClick = right;
|
||||
this.shiftClick = shift;
|
||||
+ this.doubleClick = doubleClick;
|
||||
this.result = Result.DEFAULT;
|
||||
this.rawSlot = slot;
|
||||
this.whichSlot = what.convertSlot(slot);
|
||||
@@ -67,6 +72,13 @@ public class InventoryClickEvent extends InventoryEvent implements Cancellable {
|
||||
}
|
||||
|
||||
/**
|
||||
+ * @return True if the click is a double click. If it is a double click it will group up all items from the container of the same type onto the cursor.
|
||||
+ */
|
||||
+ public boolean isDoubleClick() {
|
||||
+ return doubleClick;
|
||||
+ }
|
||||
+
|
||||
+ /**
|
||||
* Shift can be combined with right-click or left-click as a modifier.
|
||||
* @return True if the click is a shift-click.
|
||||
*/
|
||||
--
|
||||
1.8.1.2
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 6ee9f0d8a224b6746dbfb8112f94a81360efe17f Mon Sep 17 00:00:00 2001
|
||||
From 8f701b6bee49adc532831c57d566b1e7f9c21fc8 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sun, 2 Jun 2013 15:08:24 +1000
|
||||
Subject: [PATCH] Add Arrow API
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
From 6194a2aeb7c71a6d6b2cceeac5e7a1a2ea0fa60c Mon Sep 17 00:00:00 2001
|
||||
From 1f640857dc0896e9288f3c404d91d4a8e76fa52c Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sun, 2 Jun 2013 15:57:09 +1000
|
||||
Subject: [PATCH] Add Particle API
|
||||
Reference in New Issue
Block a user