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

Massive renaming update in nms. If you bypassed Bukkit, you will likely break.

Browse Source 
Also minimized all the nms diffs and generic cleanups all around.

By: Erik Broes <erikbroes@grum.nl>
This commit is contained in:
CraftBukkit/Spigot
2011-06-27 00:25:01 +02:00
parent 912a9c2c1a
commit 85e8cedcff
19 changed files with 88 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
View File

@@ -34,8 +34,8 @@ public class CraftBlockState implements BlockState {
createData(block.getData());
}
public static BlockState getBlockState(net.minecraft.server.World world, int x, int y, int z) {
return new CraftBlockState(((WorldServer) world).getWorld().getBlockAt(x, y, z));
public static CraftBlockState getBlockState(net.minecraft.server.World world, int x, int y, int z) {
return new CraftBlockState(world.getWorld().getBlockAt(x, y, z));
}
/**

4
paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftNoteBlock.java
View File

@@ -63,7 +63,7 @@ public class CraftNoteBlock extends CraftBlockState implements NoteBlock {
synchronized (block) {
if (block.getType() == Material.NOTE_BLOCK) {
world.getHandle().d(getX(), getY(), getZ(), instrument, note);
world.getHandle().playNote(getX(), getY(), getZ(), instrument, note);
return true;
} else {
return false;
@@ -76,7 +76,7 @@ public class CraftNoteBlock extends CraftBlockState implements NoteBlock {
synchronized (block) {
if (block.getType() == Material.NOTE_BLOCK) {
world.getHandle().d(getX(), getY(), getZ(), instrument.getType(), note.getId());
world.getHandle().playNote(getX(), getY(), getZ(), instrument.getType(), note.getId());
return true;
} else {
return false;