SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.7.5

Browse Source 
By: Nate Mortensen <nate.richard.mortensen@gmail.com>
This commit is contained in:
CraftBukkit/Spigot
2014-03-20 22:26:30 -06:00
parent d6c0b864b8
commit e6de9aaa17
17 changed files with 78 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
View File

@@ -85,9 +85,9 @@ public final class CraftChatMessage {
currentChatComponent = null;
break;
case 3:
modifier.a(new ChatClickable(EnumClickAction.OPEN_URL, match)); // Should be setChatClickable
modifier.setChatClickable(new ChatClickable(EnumClickAction.OPEN_URL, match));
appendNewComponent(matcher.end(groupId));
modifier.a((ChatClickable) null);
modifier.setChatClickable((ChatClickable) null);
}
currentIndex = matcher.end(groupId);
}

2
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftDamageSource.java
View File

@@ -18,7 +18,7 @@ public final class CraftDamageSource extends DamageSource {
}
// Check fire
if (original.c()) {
if (original.isExplosion()) {
newSource.n();
}

6
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
View File

@@ -93,14 +93,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public List<String> tabCompleteInternalMaterialName(String token, List<String> completions) {
return StringUtil.copyPartialMatches(token, Item.REGISTRY.b(), completions);
return StringUtil.copyPartialMatches(token, Item.REGISTRY.keySet(), completions);
}
@Override
public ItemStack modifyItemStack(ItemStack stack, String arguments) {
net.minecraft.server.ItemStack nmsStack = CraftItemStack.asNMSCopy(stack);
nmsStack.setTag((NBTTagCompound) MojangsonParser.a(arguments));
nmsStack.setTag((NBTTagCompound) MojangsonParser.parse(arguments));
stack.setItemMeta(CraftItemStack.getItemMeta(nmsStack));
@@ -122,7 +122,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
List<String> matches = new ArrayList<String>();
Iterator iterator = StatisticList.b.iterator();
while (iterator.hasNext()) {
String statistic = ((net.minecraft.server.Statistic) iterator.next()).e;
String statistic = ((net.minecraft.server.Statistic) iterator.next()).name;
if (statistic.startsWith(token)) {
matches.add(statistic);
}