OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 23:38:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update to Minecraft Server 1.2

Browse source 
By: Dinnerbone <dinnerbone@dinnerbone.com>
This commit is contained in:
CraftBukkit/Spigot 2011-01-14 13:31:10 +00:00
parent ff4b91655a
commit c695452813
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
paper-server/pom.xml
View file

@ -23,7 +23,7 @@
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>minecraft-server</artifactId> <artifactId>minecraft-server</artifactId>
<version>1.1_02</version> <version>1.2</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

10
paper-server/src/main/java/org/bukkit/craftbukkit/CraftBlock.java
View file

@ -24,7 +24,7 @@ public class CraftBlock implements Block {
this.z = z; this.z = z;
this.type = type; this.type = type;
this.data = data; this.data = data;
this.light = (byte)world.getHandle().i(x, y, z); this.light = (byte)world.getHandle().j(x, y, z);
this.chunk = (CraftChunk)world.getChunkAt(x << 4, z << 4); this.chunk = (CraftChunk)world.getChunkAt(x << 4, z << 4);
} }
@ -121,7 +121,7 @@ public class CraftBlock implements Block {
*/ */
public boolean setTypeID(final int type) { public boolean setTypeID(final int type) {
this.type = type; this.type = type;
return world.getHandle().d(x, y, z, type); return world.getHandle().e(x, y, z, type);
} }
/** /**
@ -259,9 +259,9 @@ public class CraftBlock implements Block {
Material material = getType(); Material material = getType();
switch (material) { switch (material) {
case Sign: case SIGN:
case SignPost: case SIGN_POST:
case WallSign: case WALL_SIGN:
return new CraftSign(this); return new CraftSign(this);
default: default:
return new CraftBlockState(this); return new CraftBlockState(this);

6
paper-server/src/main/java/org/bukkit/craftbukkit/CraftInventory.java
View file

@ -19,7 +19,7 @@ public class CraftInventory implements org.bukkit.Inventory {
} }
public int getSize() { public int getSize() {
return getInventory().a(); return getInventory().h_();
} }
public String getName() { public String getName() {
@ -42,7 +42,7 @@ public class CraftInventory implements org.bukkit.Inventory {
} }
public void setItem(int index, ItemStack item) { public void setItem(int index, ItemStack item) {
getInventory().a( index, new net.minecraft.server.ItemStack( item.getTypeID(), item.getAmount())); getInventory().a( index, new net.minecraft.server.ItemStack( item.getTypeID(), item.getAmount(), 0));
} }
public boolean contains(int materialId) { public boolean contains(int materialId) {
@ -121,7 +121,7 @@ public class CraftInventory implements org.bukkit.Inventory {
} }
public int firstEmpty() { public int firstEmpty() {
return first(Material.Air); return first(Material.AIR);
} }
public int firstPartial(int materialId) { public int firstPartial(int materialId) {

2
paper-server/src/main/java/org/bukkit/craftbukkit/CraftItemStack.java
View file

@ -36,7 +36,7 @@ public class CraftItemStack extends ItemStack {
item = null; item = null;
} else { } else {
if (item == null) { if (item == null) {
item = new net.minecraft.server.ItemStack(type); item = new net.minecraft.server.ItemStack(type, 1, 0);
super.setAmount(1); super.setAmount(1);
} else { } else {
item.c = type; item.c = type;

2
paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View file

@ -213,7 +213,7 @@ public class CraftWorld implements World {
} }
public TileEntity getTileEntityAt(final int x, final int y, final int z) { public TileEntity getTileEntityAt(final int x, final int y, final int z) {
return world.l(x, y, z); return world.m(x, y, z);
} }
public String getName() { public String getName() {

2
paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
View file

@ -110,7 +110,7 @@ public class CraftBlockState implements BlockState {
*/ */
public void setTypeID(final int type) { public void setTypeID(final int type) {
this.type = type; this.type = type;
world.getHandle().d(x, y, z, type); world.getHandle().e(x, y, z, type);
} }
/** /**