SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Projekte Releases Wiki Aktivität

Added spawn-protection property to server.properties

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Zenexer 2011-02-10 11:57:28 +08:00 committet von tahg
Ursprung fbe54b05f4
Commit 1da852265a
2 geänderte Dateien mit 8 neuen und 8 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
src/main/java/net/minecraft/server/ItemBlock.java
Datei anzeigen

@ -100,7 +100,7 @@ public class ItemBlock extends Item {
// CraftBukkit hardcoded Spawn distance for now // CraftBukkit hardcoded Spawn distance for now
// TODO make spawn size configurable // TODO make spawn size configurable
boolean canBuild = distanceFromSpawn > ((WorldServer) world).minecraftServer.spawnProtection || thePlayer.isOp(); boolean canBuild = distanceFromSpawn > ((WorldServer) world).D.spawnProtection || thePlayer.isOp();
BlockPlaceEvent event = new BlockPlaceEvent(eventType, placedBlock, replacedBlockState, blockClicked, itemInHand, thePlayer, canBuild); BlockPlaceEvent event = new BlockPlaceEvent(eventType, placedBlock, replacedBlockState, blockClicked, itemInHand, thePlayer, canBuild);
server.getPluginManager().callEvent(event); server.getPluginManager().callEvent(event);

14
src/main/java/net/minecraft/server/WorldServer.java
Datei anzeigen

@ -16,13 +16,13 @@ public class WorldServer extends World implements BlockChangeDelegate {
public ChunkProviderServer A; public ChunkProviderServer A;
public boolean B = false; public boolean B = false;
public boolean C; public boolean C;
public final MinecraftServer minecraftServer; public final MinecraftServer D;
private EntityList E = new EntityList(); private EntityList E = new EntityList();
public PlayerManager manager; // Craftbukkit public PlayerManager manager; // Craftbukkit
public WorldServer(MinecraftServer minecraftserver, File file1, String s, int i) { public WorldServer(MinecraftServer minecraftserver, File file1, String s, int i) {
super(file1, s, (new Random()).nextLong(), WorldProvider.a(i)); super(file1, s, (new Random()).nextLong(), WorldProvider.a(i));
this.minecraftServer = minecraftserver; this.D = minecraftserver;
// CraftBukkit start // CraftBukkit start
this.server = minecraftserver.server; this.server = minecraftserver.server;
@ -47,7 +47,7 @@ public class WorldServer extends World implements BlockChangeDelegate {
} }
public void a(Entity entity, boolean flag) { public void a(Entity entity, boolean flag) {
if (!this.minecraftServer.m && (entity instanceof EntityAnimal || entity instanceof EntityWaterAnimal)) { if (!this.D.m && (entity instanceof EntityAnimal || entity instanceof EntityWaterAnimal)) {
entity.q(); entity.q();
} }
@ -87,7 +87,7 @@ public class WorldServer extends World implements BlockChangeDelegate {
i1 = l; i1 = l;
} }
return i1 > this.minecraftServer.spawnProtection || this.minecraftServer.f.g(entityhuman.name); return i1 > this.D.spawnProtection || this.D.f.g(entityhuman.name);
} }
protected void b(Entity entity) { protected void b(Entity entity) {
@ -107,7 +107,7 @@ public class WorldServer extends World implements BlockChangeDelegate {
public void a(Entity entity, byte b0) { public void a(Entity entity, byte b0) {
Packet38EntityStatus packet38entitystatus = new Packet38EntityStatus(entity.id, b0); Packet38EntityStatus packet38entitystatus = new Packet38EntityStatus(entity.id, b0);
this.minecraftServer.k.b(entity, packet38entitystatus); this.D.k.b(entity, packet38entitystatus);
} }
public Explosion a(Entity entity, double d0, double d1, double d2, float f, boolean flag) { public Explosion a(Entity entity, double d0, double d1, double d2, float f, boolean flag) {
@ -119,12 +119,12 @@ public class WorldServer extends World implements BlockChangeDelegate {
} }
// Craftbukkit end // Craftbukkit end
this.minecraftServer.f.a(d0, d1, d2, 64.0D, new Packet60Explosion(d0, d1, d2, f, explosion.g)); this.D.f.a(d0, d1, d2, 64.0D, new Packet60Explosion(d0, d1, d2, f, explosion.g));
return explosion; return explosion;
} }
public void c(int i, int j, int k, int l, int i1) { public void c(int i, int j, int k, int l, int i1) {
super.c(i, j, k, l, i1); super.c(i, j, k, l, i1);
this.minecraftServer.f.a((double) i, (double) j, (double) k, 64.0D, new Packet54PlayNoteBlock(i, j, k, l, i1)); this.D.f.a((double) i, (double) j, (double) k, 64.0D, new Packet54PlayNoteBlock(i, j, k, l, i1));
} }
} }