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

Update CraftBukkit to Minecraft 1.7.2

Browse Source 
By: mbax <matt@phozop.net>
This commit is contained in:
CraftBukkit/Spigot
2013-11-04 07:07:38 -06:00
parent 5961c3b788
commit 5783df9d13
63 changed files with 1137 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
paper-server/src/main/java/org/bukkit/craftbukkit/command/CraftBlockCommandSender.java
View File

@@ -1,6 +1,7 @@
package org.bukkit.craftbukkit.command;
import net.minecraft.server.TileEntityCommand;
import net.minecraft.server.TileEntityCommandListener;
import org.bukkit.block.Block;
import org.bukkit.command.BlockCommandSender;
@@ -8,15 +9,15 @@ import org.bukkit.command.BlockCommandSender;
* Represents input from a command block
*/
public class CraftBlockCommandSender extends ServerCommandSender implements BlockCommandSender {
private final TileEntityCommand commandBlock;
private final TileEntityCommandListener commandBlock;
public CraftBlockCommandSender(TileEntityCommand commandBlock) {
public CraftBlockCommandSender(TileEntityCommandListener commandBlockListenerAbstract) {
super();
this.commandBlock = commandBlock;
this.commandBlock = commandBlockListenerAbstract;
}
public Block getBlock() {
return commandBlock.getWorld().getWorld().getBlockAt(commandBlock.x, commandBlock.y, commandBlock.z);
return commandBlock.getWorld().getWorld().getBlockAt(commandBlock.getChunkCoordinates().x, commandBlock.getChunkCoordinates().y, commandBlock.getChunkCoordinates().z);
}
public void sendMessage(String message) {

8
paper-server/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java
View File

@@ -1,6 +1,5 @@
package org.bukkit.craftbukkit.command;
import net.minecraft.server.ChatMessage;
import net.minecraft.server.RemoteControlCommandListener;
import org.bukkit.command.RemoteConsoleCommandSender;
@@ -9,24 +8,29 @@ public class CraftRemoteConsoleCommandSender extends ServerCommandSender impleme
super();
}
@Override
public void sendMessage(String message) {
RemoteControlCommandListener.instance.sendMessage(ChatMessage.d(message + "\n")); // Send a newline after each message, to preserve formatting.
RemoteControlCommandListener.instance.sendMessage(message + "\n"); // Send a newline after each message, to preserve formatting.
}
@Override
public void sendMessage(String[] messages) {
for (String message : messages) {
sendMessage(message);
}
}
@Override
public String getName() {
return "Rcon";
}
@Override
public boolean isOp() {
return true;
}
@Override
public void setOp(boolean value) {
throw new UnsupportedOperationException("Cannot change operator status of remote controller.");
}

52
paper-server/src/main/java/org/bukkit/craftbukkit/command/ServerCommandListener.java
View File

@@ -1,52 +0,0 @@
package org.bukkit.craftbukkit.command;
import java.lang.reflect.Method;
import net.minecraft.server.ChatMessage;
import net.minecraft.server.ChunkCoordinates;
import net.minecraft.server.ICommandListener;
import net.minecraft.server.LocaleLanguage;
import net.minecraft.server.World;
import org.bukkit.command.CommandSender;
public class ServerCommandListener implements ICommandListener {
private final CommandSender commandSender;
private final String prefix;
public ServerCommandListener(CommandSender commandSender) {
this.commandSender = commandSender;
String[] parts = commandSender.getClass().getName().split("\\.");
this.prefix = parts[parts.length - 1];
}
public void sendMessage(ChatMessage chatmessage) {
this.commandSender.sendMessage(chatmessage.toString());
}
public CommandSender getSender() {
return commandSender;
}
public String getName() {
try {
Method getName = commandSender.getClass().getMethod("getName");
return (String) getName.invoke(commandSender);
} catch (Exception e) {}
return this.prefix;
}
public boolean a(int i, String s) {
return true;
}
public ChunkCoordinates b() {
return new ChunkCoordinates(0, 0, 0);
}
public World f_() {
return null;
}
}