Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-28 13:36:16 +01:00
Code Issues Projects Releases Wiki Activity

Removed deprecated methods.

Browse Source 
getNote() that returns a byte has been replaced by getRawNote().
teleportTo(Location) has been replaced by teleport(location).
teleportTo(Entity) has been replaced by teleport(Entity).
SnowForm event has been replaced by BlockForm event.
This commit is contained in:
EvilSeph 2011-07-27 21:18:52 -04:00
parent 4fdc225528
commit 226318d8af
3 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/minecraft/server/World.java
View File

@ -20,7 +20,6 @@ import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.event.block.BlockCanBuildEvent; import org.bukkit.event.block.BlockCanBuildEvent;
import org.bukkit.event.block.BlockPhysicsEvent; import org.bukkit.event.block.BlockPhysicsEvent;
import org.bukkit.event.block.SnowFormEvent;
import org.bukkit.event.block.BlockFormEvent; import org.bukkit.event.block.BlockFormEvent;
import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.CreatureSpawnEvent;
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@ -1915,12 +1914,13 @@ public class World implements IBlockAccess {
i2 = chunk.getTypeId(l, k1, j1); i2 = chunk.getTypeId(l, k1, j1);
if (this.v() && i2 == 0 && Block.SNOW.canPlace(this, l + i, k1, j1 + j) && l1 != 0 && l1 != Block.ICE.id && Block.byId[l1].material.isSolid()) { if (this.v() && i2 == 0 && Block.SNOW.canPlace(this, l + i, k1, j1 + j) && l1 != 0 && l1 != Block.ICE.id && Block.byId[l1].material.isSolid()) {
// CraftBukkit start // CraftBukkit start
SnowFormEvent snow = new SnowFormEvent(this.getWorld().getBlockAt(l + i, k1, j1 + j)); BlockState blockState = this.getWorld().getBlockAt(l + i, k1, j1 + j).getState();
blockState.setTypeId(Block.SNOW.id);
BlockFormEvent snow = new BlockFormEvent(blockState.getBlock(), blockState);
this.getServer().getPluginManager().callEvent(snow); this.getServer().getPluginManager().callEvent(snow);
if (!snow.isCancelled()) { if (!snow.isCancelled()) {
this.setTypeId(l + i, k1, j1 + j, snow.getMaterial().getId()); blockState.update(true);
this.setData(l + i, k1, j1 + j, snow.getData());
} }
// CraftBukkit end // CraftBukkit end
} }

10
src/main/java/org/bukkit/craftbukkit/block/CraftNoteBlock.java
View File

@ -20,9 +20,8 @@ public class CraftNoteBlock extends CraftBlockState implements NoteBlock {
note = (TileEntityNote) world.getTileEntityAt(getX(), getY(), getZ()); note = (TileEntityNote) world.getTileEntityAt(getX(), getY(), getZ());
} }
@Deprecated public Note getNote() {
public byte getNote() { return new Note(note.note);
return note.note;
} }
public byte getRawNote() { public byte getRawNote() {
@ -33,11 +32,6 @@ public class CraftNoteBlock extends CraftBlockState implements NoteBlock {
note.note = n.getId(); note.note = n.getId();
} }
@Deprecated
public void setNote(byte n) {
note.note = n;
}
public void setRawNote(byte n) { public void setRawNote(byte n) {
note.note = n; note.note = n;
} }

8
src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
View File

@ -132,14 +132,6 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return teleport(destination.getLocation()); return teleport(destination.getLocation());
} }
public void teleportTo(Location location) {
teleport(location);
}
public void teleportTo(org.bukkit.entity.Entity destination) {
teleport(destination);
}
public List<org.bukkit.entity.Entity> getNearbyEntities(double x, double y, double z) { public List<org.bukkit.entity.Entity> getNearbyEntities(double x, double y, double z) {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
List<Entity> notchEntityList = entity.world.b(entity, entity.boundingBox.b(x, y, z)); List<Entity> notchEntityList = entity.world.b(entity, entity.boundingBox.b(x, y, z));