xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Update to Forge 1343. Small fixes.

Browse Source
This commit is contained in:
gamerforEA
2015-03-30 10:25:29 +03:00
parent 3c203341c9
commit 6f8f13347d
16 changed files with 203 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
patches/org/bukkit/Effect.java.patch
View File

@ -8,7 +8,7 @@
import org.bukkit.potion.Potion;
/**
@@ -79,27 +80,183 @@
@@ -79,27 +80,188 @@
/**
* The flames seen on a mobspawner; a visual effect.
*/
@ -139,6 +139,11 @@
+ */
+ HAPPY_VILLAGER("happyVillager", Type.PARTICLE),
+ /**
+ * The smoke particles that appears on blazes, minecarts
+ * with furnaces and fire
+ */
+ LARGE_SMOKE("largesmoke", Type.PARTICLE),
+ /**
+ * The particles generated when a tool breaks.
+ * This particle requires a Material so that the client can select the correct texture.
+ */
@ -196,7 +201,7 @@
* @deprecated Magic value
*/
@Deprecated
@@ -108,6 +265,15 @@
@@ -108,6 +270,15 @@
}
/**
@ -212,7 +217,7 @@
* @return The type of the effect.
*/
public Type getType() {
@@ -115,8 +281,7 @@
@@ -115,8 +286,7 @@
}
/**
@ -222,7 +227,7 @@
*/
public Class<?> getData() {
return this.data;
@@ -136,12 +301,32 @@
@@ -136,12 +306,32 @@
static {
for (Effect effect : values()) {

14
patches/org/bukkit/command/defaults/DeopCommand.java.patch Normal file
View File

@ -0,0 +1,14 @@
--- ../src-base/minecraft/org/bukkit/command/defaults/DeopCommand.java
+++ ../src-work/minecraft/org/bukkit/command/defaults/DeopCommand.java
@@ -49,9 +49,9 @@
if (args.length == 1) {
List<String> completions = new ArrayList<String>();
- for (OfflinePlayer player : Bukkit.getOfflinePlayers()) {
+ for (OfflinePlayer player : Bukkit.getOperators()) {
String playerName = player.getName();
- if (player.isOp() && StringUtil.startsWithIgnoreCase(playerName, args[0])) {
+ if (StringUtil.startsWithIgnoreCase(playerName, args[0])) {
completions.add(playerName);
}
}

11
patches/org/bukkit/command/defaults/WhitelistCommand.java.patch Normal file
View File

@ -0,0 +1,11 @@
--- ../src-base/minecraft/org/bukkit/command/defaults/WhitelistCommand.java
+++ ../src-work/minecraft/org/bukkit/command/defaults/WhitelistCommand.java
@@ -104,7 +104,7 @@
} else if (args.length == 2) {
if (args[0].equalsIgnoreCase("add")) {
List<String> completions = new ArrayList<String>();
- for (OfflinePlayer player : Bukkit.getOfflinePlayers()) {
+ for (OfflinePlayer player : Bukkit.getOnlinePlayers()) {
String name = player.getName();
if (StringUtil.startsWithIgnoreCase(name, args[1]) && !player.isWhitelisted()) {
completions.add(name);