OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Updated to Minecraft version 1.4

Browse source 
By: Dinnerbone <dinnerbone@dinnerbone.com>
This commit is contained in:
CraftBukkit/Spigot 2011-03-31 21:40:00 +01:00
parent 3669bb0d8b
commit adcc9c9ddf
14 changed files with 35 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
paper-server/pom.xml
View file

@ -39,7 +39,7 @@
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>minecraft-server</artifactId> <artifactId>minecraft-server</artifactId>
<version>1.3</version> <version>1.4</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

13
paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
View file

@ -9,6 +9,7 @@ import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Random;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import jline.ConsoleReader; import jline.ConsoleReader;
@ -36,7 +37,7 @@ import org.bukkit.craftbukkit.scheduler.CraftScheduler;
public final class CraftServer implements Server { public final class CraftServer implements Server {
private final String serverName = "Craftbukkit"; private final String serverName = "Craftbukkit";
private final String serverVersion; private final String serverVersion;
private final String protocolVersion = "1.3"; private final String protocolVersion = "1.4";
private final PluginManager pluginManager = new SimplePluginManager(this); private final PluginManager pluginManager = new SimplePluginManager(this);
private final BukkitScheduler scheduler = new CraftScheduler(this); private final BukkitScheduler scheduler = new CraftScheduler(this);
private final CommandMap commandMap = new SimpleCommandMap(this); private final CommandMap commandMap = new SimpleCommandMap(this);
@ -269,6 +270,10 @@ public final class CraftServer implements Server {
} }
public World createWorld(String name, World.Environment environment) { public World createWorld(String name, World.Environment environment) {
return createWorld(name, environment, (new Random()).nextLong());
}
public World createWorld(String name, World.Environment environment, long seed) {
File folder = new File(name); File folder = new File(name);
World world = getWorld(name); World world = getWorld(name);
@ -286,7 +291,7 @@ public final class CraftServer implements Server {
converter.a(name, new ConvertProgressUpdater(console)); converter.a(name, new ConvertProgressUpdater(console));
} }
WorldServer internal = new WorldServer(console, new ServerNBTManager(new File("."), name, true), name, environment == World.Environment.NETHER ? -1 : 0); WorldServer internal = new WorldServer(console, new ServerNBTManager(new File("."), name, true), name, environment == World.Environment.NETHER ? -1 : 0, seed);
internal.a(new WorldManager(console, internal)); internal.a(new WorldManager(console, internal));
internal.j = 1; internal.j = 1;
@ -312,10 +317,10 @@ public final class CraftServer implements Server {
i = l; i = l;
} }
ChunkCoordinates chunkcoordinates = internal.l(); ChunkCoordinates chunkcoordinates = internal.m();
internal.u.d(chunkcoordinates.a + j >> 4, chunkcoordinates.c + k >> 4); internal.u.d(chunkcoordinates.a + j >> 4, chunkcoordinates.c + k >> 4);
while (internal.e()) { while (internal.f()) {
; ;
} }
} }

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

@ -66,7 +66,7 @@ public class CraftWorld implements World {
} }
public Location getSpawnLocation() { public Location getSpawnLocation() {
ChunkCoordinates spawn = world.l(); ChunkCoordinates spawn = world.m();
return new Location(this, spawn.a, spawn.b, spawn.c); return new Location(this, spawn.a, spawn.b, spawn.c);
} }
@ -80,7 +80,7 @@ public class CraftWorld implements World {
} }
public Chunk getChunkAt(int x, int z) { public Chunk getChunkAt(int x, int z) {
return this.provider.d(x,z).bukkitChunk; return this.provider.c(x, z).bukkitChunk;
} }
public Chunk getChunkAt(Block block) { public Chunk getChunkAt(Block block) {
@ -124,7 +124,7 @@ public class CraftWorld implements World {
return false; return false;
} }
provider.c(x, z); provider.d(x, z);
return true; return true;
} }
@ -214,7 +214,7 @@ public class CraftWorld implements World {
public boolean loadChunk(int x, int z, boolean generate) { public boolean loadChunk(int x, int z, boolean generate) {
if (generate) { if (generate) {
// Use the default variant of loadChunk when generate == true. // Use the default variant of loadChunk when generate == true.
return provider.d(x, z) != null; return provider.c(x, z) != null;
} }
provider.a.remove(x, z); provider.a.remove(x, z);
@ -524,7 +524,7 @@ public class CraftWorld implements World {
public void save() { public void save() {
// Writes level.dat // Writes level.dat
world.r(); world.t();
// Saves all chunks/regions // Saves all chunks/regions
world.o.a(true, null); world.o.a(true, null);

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

@ -387,12 +387,12 @@ public class CraftBlock implements Block {
int power = 0; int power = 0;
BlockRedstoneWire wire = (BlockRedstoneWire) net.minecraft.server.Block.REDSTONE_WIRE; BlockRedstoneWire wire = (BlockRedstoneWire) net.minecraft.server.Block.REDSTONE_WIRE;
net.minecraft.server.World world = chunk.getHandle().d; net.minecraft.server.World world = chunk.getHandle().d;
if ((face == BlockFace.DOWN || face == BlockFace.SELF) && world.i(x, y - 1, z, 0)) power = wire.g(world, x, y - 1, z, power); if ((face == BlockFace.DOWN || face == BlockFace.SELF) && world.i(x, y - 1, z, 0)) power = wire.f(world, x, y - 1, z, power);
if ((face == BlockFace.UP || face == BlockFace.SELF) && world.i(x, y + 1, z, 1)) power = wire.g(world, x, y + 1, z, power); if ((face == BlockFace.UP || face == BlockFace.SELF) && world.i(x, y + 1, z, 1)) power = wire.f(world, x, y + 1, z, power);
if ((face == BlockFace.EAST || face == BlockFace.SELF) && world.i(x, y, z - 1, 2)) power = wire.g(world, x, y, z - 1, power); if ((face == BlockFace.EAST || face == BlockFace.SELF) && world.i(x, y, z - 1, 2)) power = wire.f(world, x, y, z - 1, power);
if ((face == BlockFace.WEST || face == BlockFace.SELF) && world.i(x, y, z + 1, 3)) power = wire.g(world, x, y, z + 1, power); if ((face == BlockFace.WEST || face == BlockFace.SELF) && world.i(x, y, z + 1, 3)) power = wire.f(world, x, y, z + 1, power);
if ((face == BlockFace.NORTH || face == BlockFace.SELF) && world.i(x - 1, y, z, 4)) power = wire.g(world, x - 1, y, z, power); if ((face == BlockFace.NORTH || face == BlockFace.SELF) && world.i(x - 1, y, z, 4)) power = wire.f(world, x - 1, y, z, power);
if ((face == BlockFace.SOUTH || face == BlockFace.SELF) && world.i(x + 1, y, z, 5)) power = wire.g(world, x + 1, y, z, power); if ((face == BlockFace.SOUTH || face == BlockFace.SELF) && world.i(x + 1, y, z, 5)) power = wire.f(world, x + 1, y, z, power);
return power > 0 ? power : (face == BlockFace.SELF ? isBlockIndirectlyPowered() : isBlockFaceIndirectlyPowered(face)) ? 15 : 0; return power > 0 ? power : (face == BlockFace.SELF ? isBlockIndirectlyPowered() : isBlockFaceIndirectlyPowered(face)) ? 15 : 0;
} }

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

@ -32,7 +32,7 @@ public class CraftChest extends CraftBlockState implements Chest {
boolean result = super.update(force); boolean result = super.update(force);
if (result) { if (result) {
chest.h(); chest.i();
} }
return result; return result;

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

@ -49,7 +49,7 @@ public class CraftDispenser extends CraftBlockState implements Dispenser {
boolean result = super.update(force); boolean result = super.update(force);
if (result) { if (result) {
dispenser.h(); dispenser.i();
} }
return result; return result;

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

@ -32,7 +32,7 @@ public class CraftFurnace extends CraftBlockState implements Furnace {
boolean result = super.update(force); boolean result = super.update(force);
if (result) { if (result) {
furnace.h(); furnace.i();
} }
return result; return result;

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

@ -33,7 +33,7 @@ public class CraftSign extends CraftBlockState implements Sign {
boolean result = super.update(force); boolean result = super.update(force);
if (result) { if (result) {
sign.h(); sign.i();
} }
return result; return result;

8
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View file

@ -158,7 +158,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
newEntity.health = entity.health; newEntity.health = entity.health;
newEntity.fireTicks = entity.fireTicks; newEntity.fireTicks = entity.fireTicks;
newEntity.inventory = entity.inventory; newEntity.inventory = entity.inventory;
newEntity.inventory.e = newEntity; newEntity.inventory.d = newEntity;
newEntity.activeContainer = entity.activeContainer; newEntity.activeContainer = entity.activeContainer;
newEntity.defaultContainer = entity.defaultContainer; newEntity.defaultContainer = entity.defaultContainer;
newEntity.locX = location.getX(); newEntity.locX = location.getX();
@ -194,14 +194,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
} }
public void setSneaking(boolean sneak) { public void setSneaking(boolean sneak) {
getHandle().b(sneak); getHandle().e(sneak);
} }
public boolean isSneaking() { public boolean isSneaking() {
return getHandle().U(); return getHandle().Z();
} }
public void updateInventory() { public void updateInventory() {
getHandle().l(); getHandle().m();
} }
} }

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

@ -22,7 +22,7 @@ public class CraftSheep extends CraftAnimals implements Sheep {
} }
public DyeColor getColor() { public DyeColor getColor() {
return DyeColor.getByData((byte) getHandle().n()); return DyeColor.getByData((byte) getHandle().o());
} }
public void setColor(DyeColor color) { public void setColor(DyeColor color) {

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

@ -21,7 +21,7 @@ public class CraftSlime extends CraftLivingEntity implements Slime {
} }
public int getSize() { public int getSize() {
return getHandle().c; return getHandle().m();
} }
public void setSize(int size) { public void setSize(int size) {

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

@ -50,7 +50,7 @@ public class CraftEventFactory {
if (spawnSize <= 0) return true; if (spawnSize <= 0) return true;
if (player.isOp()) return true; if (player.isOp()) return true;
ChunkCoordinates chunkcoordinates = worldServer.l(); ChunkCoordinates chunkcoordinates = worldServer.m();
int distanceFromSpawn = (int) Math.max(Math.abs(x - chunkcoordinates.a), Math.abs(z - chunkcoordinates.c)); int distanceFromSpawn = (int) Math.max(Math.abs(x - chunkcoordinates.a), Math.abs(z - chunkcoordinates.c));
return distanceFromSpawn > spawnSize; return distanceFromSpawn > spawnSize;

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

@ -19,7 +19,7 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
} }
public int getSize() { public int getSize() {
return getInventory().m_(); return getInventory().q_();
} }
public String getName() { public String getName() {
@ -290,7 +290,7 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
} }
private int getMaxItemStack() { private int getMaxItemStack() {
return getInventory().n_(); return getInventory().r_();
} }
public void remove(int materialId) { public void remove(int materialId) {

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

@ -20,6 +20,6 @@ public class CraftSlot implements org.bukkit.inventory.Slot {
} }
public ItemStack getItem() { public ItemStack getItem() {
return new CraftItemStack( slot.b() ); return new CraftItemStack( slot.a() );
} }
} }