3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-16 11:30:06 +01:00

Just under 2 months for CB to pull - new record!

Dieser Commit ist enthalten in:
md_5 2013-06-04 17:44:12 +10:00
Ursprung 8cb46db2f3
Commit fced81e629
23 geänderte Dateien mit 29 neuen und 141 gelöschten Zeilen

2
Bukkit

@ -1 +1 @@
Subproject commit faea684c23ded0c19119f8eba45856c9a8c1b497
Subproject commit cd0205e53eda66f6bcc6545c739d80f9089466d2

Datei anzeigen

@ -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

Datei anzeigen

@ -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

Datei anzeigen

@ -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

Datei anzeigen

@ -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

@ -1 +1 @@
Subproject commit 53734d29b6b9a0bc9b2d5c66d8fff3eadb963cb8
Subproject commit c397dc04935384a10e28b10688f6f2072a325ccc

Datei anzeigen

@ -1,4 +1,4 @@
From 22cc47a082b3be3c1d9d3b129b99b7fcff526284 Mon Sep 17 00:00:00 2001
From a13cbbfb3edbbccf0866e72322dca3d8d88f9b2d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 4 May 2013 10:14:01 +1000
Subject: [PATCH] Spigot Changes
@ -239,10 +239,10 @@ index bee715b..9643480 100644
if (pendingchunktosave != null) {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 5d10382..bc55a77 100644
index 42dbc56..e9f39c7 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -839,8 +839,20 @@ public class PlayerConnection extends Connection {
@@ -845,8 +845,20 @@ public class PlayerConnection extends Connection {
this.chat(s, packet3chat.a_());
@ -264,7 +264,7 @@ index 5d10382..bc55a77 100644
if (packet3chat.a_()) {
Waitable waitable = new Waitable() {
@Override
@@ -961,7 +973,7 @@ public class PlayerConnection extends Connection {
@@ -967,7 +979,7 @@ public class PlayerConnection extends Connection {
}
try {
@ -273,7 +273,7 @@ index 5d10382..bc55a77 100644
if (this.server.dispatchCommand(event.getPlayer(), event.getMessage().substring(1))) {
return;
}
@@ -1340,8 +1352,9 @@ public class PlayerConnection extends Connection {
@@ -1558,8 +1570,9 @@ public class PlayerConnection extends Connection {
flag = false;
} else {
for (i = 0; i < packet130updatesign.lines[j].length(); ++i) {
@ -707,7 +707,7 @@ index 6cb50b7..12c5f81 100644
player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command");
getLogger().log(Level.SEVERE, "Exception when " + player.getName() + " attempted to tab complete " + message, ex);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 6c7f570..63e8e69 100644
index c0fb528..8958643 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -77,7 +77,76 @@ public class CraftWorld implements World {

Datei anzeigen

@ -1,4 +1,4 @@
From 98062ce09bdbbd6f48f883bf84c2644e316703af Mon Sep 17 00:00:00 2001
From d110295433aaf1e10fec3b918e8a9882c2dfb429 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Improved Timings System
@ -213,10 +213,10 @@ index 3c80340..db396b3 100644
this.methodProfiler.b();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index bc55a77..2e1246e 100644
index e9f39c7..46b575c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -962,6 +962,7 @@ public class PlayerConnection extends Connection {
@@ -968,6 +968,7 @@ public class PlayerConnection extends Connection {
// CraftBukkit end
private void handleCommand(String s) {
@ -224,7 +224,7 @@ index bc55a77..2e1246e 100644
// CraftBukkit start
CraftPlayer player = this.getPlayer();
@@ -969,19 +970,23 @@ public class PlayerConnection extends Connection {
@@ -975,19 +976,23 @@ public class PlayerConnection extends Connection {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {

Datei anzeigen

@ -1,4 +1,4 @@
From 442538d67c0da2a21a5ab2c822713eba629fc30a Mon Sep 17 00:00:00 2001
From ecac6ac2d1fe5e3ee100248f6ae7e4bb98ccf153 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 24 Feb 2013 20:45:20 +1100
Subject: [PATCH] Enable Improved ping sending

Datei anzeigen

@ -1,39 +0,0 @@
From 6c184f6e64f5c8c223f37366747dca8e1565c0ab Mon Sep 17 00:00:00 2001
From: Tyler Blair <hidendra@griefcraft.com>
Date: Tue, 9 Apr 2013 17:55:15 -0300
Subject: [PATCH] InventoryClickEvent now can return if the click was a double
click. 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/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 2e1246e..0621625 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1178,12 +1178,12 @@ public class PlayerConnection extends Connection {
InventoryView inventory = this.player.activeContainer.getBukkitView();
SlotType type = CraftInventoryView.getSlotType(inventory, packet102windowclick.slot);
- InventoryClickEvent event = new InventoryClickEvent(inventory, type, packet102windowclick.slot, packet102windowclick.button != 0, packet102windowclick.shift == 1);
+ InventoryClickEvent event = new InventoryClickEvent(inventory, type, packet102windowclick.slot, packet102windowclick.button != 0, packet102windowclick.shift == 1, packet102windowclick.shift == 6);
org.bukkit.inventory.Inventory top = inventory.getTopInventory();
if (packet102windowclick.slot == 0 && top instanceof CraftingInventory) {
org.bukkit.inventory.Recipe recipe = ((CraftingInventory) top).getRecipe();
if (recipe != null) {
- event = new org.bukkit.event.inventory.CraftItemEvent(recipe, inventory, type, packet102windowclick.slot, packet102windowclick.button != 0, packet102windowclick.shift == 1);
+ event = new org.bukkit.event.inventory.CraftItemEvent(recipe, inventory, type, packet102windowclick.slot, packet102windowclick.button != 0, packet102windowclick.shift == 1, packet102windowclick.shift == 6);
}
}
server.getPluginManager().callEvent(event);
@@ -1271,7 +1271,7 @@ public class PlayerConnection extends Connection {
slot = SlotType.OUTSIDE;
}
- InventoryClickEvent event = new InventoryClickEvent(inventory, slot, slot == SlotType.OUTSIDE ? -999 : packet107setcreativeslot.slot, false, false);
+ InventoryClickEvent event = new InventoryClickEvent(inventory, slot, slot == SlotType.OUTSIDE ? -999 : packet107setcreativeslot.slot, false, false, false);
server.getPluginManager().callEvent(event);
org.bukkit.inventory.ItemStack item = event.getCurrentItem();
--
1.8.1.2

Datei anzeigen

@ -1,4 +1,4 @@
From 7371e8acd34c5e462e59f990240dc52e44aeb962 Mon Sep 17 00:00:00 2001
From 23a19cbbb1470706bd2afc5c36d854ddc06eb612 Mon Sep 17 00:00:00 2001
From: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
Date: Sun, 14 Apr 2013 21:19:57 +0500
Subject: [PATCH] Prevent handshake spam from invalid names.

Datei anzeigen

@ -1,4 +1,4 @@
From 3baffd4e017b02dc0f7e8ced62678cc9c2d66797 Mon Sep 17 00:00:00 2001
From 95080f9e04c482ed4933127e6fc168bacda5705b Mon Sep 17 00:00:00 2001
From: Ammar Askar <ammar@ammaraskar.com>
Date: Sat, 20 Apr 2013 12:26:20 +0500
Subject: [PATCH] Save entity counts for randomly spawned creatures to avoid

Datei anzeigen

@ -1,4 +1,4 @@
From 89baea1244c5bd0d245687c6de5a23cd5c23a9a9 Mon Sep 17 00:00:00 2001
From a2fe5c56cdf05ae4b6059efbcef0944e6996d948 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 23 Apr 2013 11:50:27 +1000
Subject: [PATCH] Thread Naming and Tweaks

Datei anzeigen

@ -1,4 +1,4 @@
From 849e612582e29a97fb9fdff7b0801f70bc605fdc Mon Sep 17 00:00:00 2001
From 5c5037722c8a053eb892c71f334b0ed326c6d12b Mon Sep 17 00:00:00 2001
From: Antony Riley <antony@cyberiantiger.org>
Date: Wed, 27 Mar 2013 01:41:54 +0200
Subject: [PATCH] Fixes BUKKIT-3893 - Close world save files when world is

Datei anzeigen

@ -1,4 +1,4 @@
From 5cbf818b79388ec772c2747b2b18a66e6645e99c Mon Sep 17 00:00:00 2001
From 1eda0bec0c7a569e15b92245bbbebddeaecb2caf Mon Sep 17 00:00:00 2001
From: snowleo <schneeleo@gmail.com>
Date: Wed, 8 May 2013 12:09:45 +1000
Subject: [PATCH] Optimized version of LocaleLanguage

Datei anzeigen

@ -1,4 +1,4 @@
From 48582cf8be777dc589366fa9067709b3d6954de7 Mon Sep 17 00:00:00 2001
From c54f4556a24657fde44ca90d32acbae0cb9313ae Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Wed, 24 Apr 2013 01:43:33 -0500
Subject: [PATCH] Improve next-tick-list performance on chunk unloads, large

Datei anzeigen

@ -1,4 +1,4 @@
From 77e98dfc4dbfe67142db7b7b1bf60048b2feb979 Mon Sep 17 00:00:00 2001
From cbb1e2e40b20215c1dd05ce7d37c68a9ef30b17f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 19 May 2013 18:29:48 +1000
Subject: [PATCH] Remove -o Option

Datei anzeigen

@ -1,4 +1,4 @@
From 92b1b9a12f5a5fb763a562f6c59803c648ae8548 Mon Sep 17 00:00:00 2001
From 6f48274508277dd764275202cbfe35bdb5f209e3 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 1 Jun 2013 16:34:38 +1000
Subject: [PATCH] Recipe Deconstruction

Datei anzeigen

@ -1,4 +1,4 @@
From 6f39ac92dbda094dd5401cb1550f1f173ca4d765 Mon Sep 17 00:00:00 2001
From 46010bb2eda8911ec87f0ab8faff26a98609cefd Mon Sep 17 00:00:00 2001
From: Nick Minkler <sleaker@gmail.com>
Date: Sun, 2 Jun 2013 14:54:11 +1000
Subject: [PATCH] Fix Health Scaling

Datei anzeigen

@ -1,4 +1,4 @@
From a9ee7d740515b8adb22ee934aa473bd79145ae7e Mon Sep 17 00:00:00 2001
From 856246399b92629d9e8040987e04388b490b9a91 Mon Sep 17 00:00:00 2001
From: Nick Minkler <sleaker@gmail.com>
Date: Sun, 2 Jun 2013 15:04:37 +1000
Subject: [PATCH] Fix EntityShootBowEvent with Skeletons

Datei anzeigen

@ -1,4 +1,4 @@
From 767510f3399a07fd11399188fefaa87c8f4a290c Mon Sep 17 00:00:00 2001
From 6d7480f55a2722135709441b35387dcab70bbdcb Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:16:05 +1000
Subject: [PATCH] Implement Arrow API

Datei anzeigen

@ -1,4 +1,4 @@
From 03cf9c87436da5821b635aedc23144a5c711a2aa Mon Sep 17 00:00:00 2001
From 6108b52c108ecbc37417bfccefa1782e75c19d58 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 16:14:30 +1000
Subject: [PATCH] Particle API

Datei anzeigen

@ -1,4 +1,4 @@
From 22995b47cda3e4de4d73e4f43f57d26db104b199 Mon Sep 17 00:00:00 2001
From 44a54f1f7c3bb73fe9237125a84225324d627570 Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
Date: Sun, 2 Jun 2013 16:23:46 +1000
Subject: [PATCH] Hopper Cooldowns