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

SPIGOT-6508: Rename conflicted getServer

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-06-11 21:33:49 +10:00
parent dd358f1352
commit 536256d6ff
95 changed files with 211 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View File

@@ -335,7 +335,7 @@ public class CraftEventFactory {
*/
public static BlockMultiPlaceEvent callBlockMultiPlaceEvent(WorldServer world, EntityHuman who, EnumHand hand, List<BlockState> blockStates, int clickedX, int clickedY, int clickedZ) {
CraftWorld craftWorld = world.getWorld();
CraftServer craftServer = world.getServer();
CraftServer craftServer = world.getCraftServer();
Player player = (Player) who.getBukkitEntity();
Block blockClicked = craftWorld.getBlockAt(clickedX, clickedY, clickedZ);
@@ -363,7 +363,7 @@ public class CraftEventFactory {
public static BlockPlaceEvent callBlockPlaceEvent(WorldServer world, EntityHuman who, EnumHand hand, BlockState replacedBlockState, int clickedX, int clickedY, int clickedZ) {
CraftWorld craftWorld = world.getWorld();
CraftServer craftServer = world.getServer();
CraftServer craftServer = world.getCraftServer();
Player player = (Player) who.getBukkitEntity();
@@ -409,7 +409,7 @@ public class CraftEventFactory {
org.bukkit.block.BlockFace blockFace = org.bukkit.craftbukkit.block.CraftBlock.notchToBlockFace(clickedFace);
EntityPlaceEvent event = new EntityPlaceEvent(entity.getBukkitEntity(), who, blockClicked, blockFace);
entity.level.getServer().getPluginManager().callEvent(event);
entity.level.getCraftServer().getPluginManager().callEvent(event);
return event;
}
@@ -579,7 +579,7 @@ public class CraftEventFactory {
boolean isNpc = entity instanceof NPC;
if (spawnReason != SpawnReason.CUSTOM) {
if (isAnimal && !world.getWorld().getAllowAnimals() || isMonster && !world.getWorld().getAllowMonsters() || isNpc && !world.getServer().getServer().getSpawnNPCs()) {
if (isAnimal && !world.getWorld().getAllowAnimals() || isMonster && !world.getWorld().getAllowMonsters() || isNpc && !world.getCraftServer().getServer().getSpawnNPCs()) {
entity.die();
return false;
}
@@ -1072,7 +1072,7 @@ public class CraftEventFactory {
public static FluidLevelChangeEvent callFluidLevelChangeEvent(World world, BlockPosition block, IBlockData newData) {
FluidLevelChangeEvent event = new FluidLevelChangeEvent(CraftBlock.at(world, block), CraftBlockData.fromData(newData));
world.getServer().getPluginManager().callEvent(event);
world.getCraftServer().getPluginManager().callEvent(event);
return event;
}
@@ -1148,7 +1148,7 @@ public class CraftEventFactory {
player.connection.a(new PacketPlayInCloseWindow(player.containerMenu.containerId));
}
CraftServer server = player.level.getServer();
CraftServer server = player.level.getCraftServer();
CraftPlayer craftPlayer = player.getBukkitEntity();
player.containerMenu.transferTo(container, craftPlayer);
@@ -1202,7 +1202,7 @@ public class CraftEventFactory {
}
ProjectileHitEvent event = new ProjectileHitEvent((Projectile) entity.getBukkitEntity(), hitEntity, hitBlock, hitFace);
entity.level.getServer().getPluginManager().callEvent(event);
entity.level.getCraftServer().getPluginManager().callEvent(event);
return event;
}
@@ -1215,13 +1215,13 @@ public class CraftEventFactory {
public static BlockRedstoneEvent callRedstoneChange(World world, BlockPosition pos, int oldCurrent, int newCurrent) {
BlockRedstoneEvent event = new BlockRedstoneEvent(world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()), oldCurrent, newCurrent);
world.getServer().getPluginManager().callEvent(event);
world.getCraftServer().getPluginManager().callEvent(event);
return event;
}
public static NotePlayEvent callNotePlayEvent(World world, BlockPosition pos, BlockPropertyInstrument instrument, int note) {
NotePlayEvent event = new NotePlayEvent(world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()), org.bukkit.Instrument.getByType((byte) instrument.ordinal()), new org.bukkit.Note(note));
world.getServer().getPluginManager().callEvent(event);
world.getCraftServer().getPluginManager().callEvent(event);
return event;
}
@@ -1248,7 +1248,7 @@ public class CraftEventFactory {
}
BlockIgniteEvent event = new BlockIgniteEvent(bukkitWorld.getBlockAt(block.getX(), block.getY(), block.getZ()), cause, igniter);
world.getServer().getPluginManager().callEvent(event);
world.getCraftServer().getPluginManager().callEvent(event);
return event;
}
@@ -1282,7 +1282,7 @@ public class CraftEventFactory {
}
BlockIgniteEvent event = new BlockIgniteEvent(bukkitWorld.getBlockAt(pos.getX(), pos.getY(), pos.getZ()), cause, bukkitIgniter);
world.getServer().getPluginManager().callEvent(event);
world.getCraftServer().getPluginManager().callEvent(event);
return event;
}
@@ -1291,25 +1291,25 @@ public class CraftEventFactory {
org.bukkit.entity.Entity igniter = explosion.source == null ? null : explosion.source.getBukkitEntity();
BlockIgniteEvent event = new BlockIgniteEvent(bukkitWorld.getBlockAt(x, y, z), IgniteCause.EXPLOSION, igniter);
world.getServer().getPluginManager().callEvent(event);
world.getCraftServer().getPluginManager().callEvent(event);
return event;
}
public static BlockIgniteEvent callBlockIgniteEvent(World world, BlockPosition pos, IgniteCause cause, Entity igniter) {
BlockIgniteEvent event = new BlockIgniteEvent(world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()), cause, igniter.getBukkitEntity());
world.getServer().getPluginManager().callEvent(event);
world.getCraftServer().getPluginManager().callEvent(event);
return event;
}
public static void handleInventoryCloseEvent(EntityHuman human) {
InventoryCloseEvent event = new InventoryCloseEvent(human.containerMenu.getBukkitView());
human.level.getServer().getPluginManager().callEvent(event);
human.level.getCraftServer().getPluginManager().callEvent(event);
human.containerMenu.transferTo(human.inventoryMenu, human.getBukkitEntity());
}
public static ItemStack handleEditBookEvent(EntityPlayer player, int itemInHandIndex, ItemStack itemInHand, ItemStack newBookItem) {
PlayerEditBookEvent editBookEvent = new PlayerEditBookEvent(player.getBukkitEntity(), (itemInHandIndex >= 0 && itemInHandIndex <= 8) ? itemInHandIndex : -1, (BookMeta) CraftItemStack.getItemMeta(itemInHand), (BookMeta) CraftItemStack.getItemMeta(newBookItem), newBookItem.getItem() == Items.WRITTEN_BOOK);
player.level.getServer().getPluginManager().callEvent(editBookEvent);
player.level.getCraftServer().getPluginManager().callEvent(editBookEvent);
// If they've got the same item in their hand, it'll need to be updated.
if (itemInHand != null && itemInHand.getItem() == Items.WRITABLE_BOOK) {
@@ -1327,13 +1327,13 @@ public class CraftEventFactory {
public static PlayerUnleashEntityEvent callPlayerUnleashEntityEvent(EntityInsentient entity, EntityHuman player) {
PlayerUnleashEntityEvent event = new PlayerUnleashEntityEvent(entity.getBukkitEntity(), (Player) player.getBukkitEntity());
entity.level.getServer().getPluginManager().callEvent(event);
entity.level.getCraftServer().getPluginManager().callEvent(event);
return event;
}
public static PlayerLeashEntityEvent callPlayerLeashEntityEvent(EntityInsentient entity, Entity leashHolder, EntityHuman player) {
PlayerLeashEntityEvent event = new PlayerLeashEntityEvent(entity.getBukkitEntity(), leashHolder.getBukkitEntity(), (Player) player.getBukkitEntity());
entity.level.getServer().getPluginManager().callEvent(event);
entity.level.getCraftServer().getPluginManager().callEvent(event);
return event;
}
@@ -1393,13 +1393,13 @@ public class CraftEventFactory {
event = new PlayerStatisticIncrementEvent(player, stat, current, newValue, material);
}
}
entityHuman.level.getServer().getPluginManager().callEvent(event);
entityHuman.level.getCraftServer().getPluginManager().callEvent(event);
return (Cancellable) event;
}
public static FireworkExplodeEvent callFireworkExplodeEvent(EntityFireworks firework) {
FireworkExplodeEvent event = new FireworkExplodeEvent((Firework) firework.getBukkitEntity());
firework.level.getServer().getPluginManager().callEvent(event);
firework.level.getCraftServer().getPluginManager().callEvent(event);
return event;
}
@@ -1419,19 +1419,19 @@ public class CraftEventFactory {
public static EntityToggleGlideEvent callToggleGlideEvent(EntityLiving entity, boolean gliding) {
EntityToggleGlideEvent event = new EntityToggleGlideEvent((LivingEntity) entity.getBukkitEntity(), gliding);
entity.level.getServer().getPluginManager().callEvent(event);
entity.level.getCraftServer().getPluginManager().callEvent(event);
return event;
}
public static EntityToggleSwimEvent callToggleSwimEvent(EntityLiving entity, boolean swimming) {
EntityToggleSwimEvent event = new EntityToggleSwimEvent((LivingEntity) entity.getBukkitEntity(), swimming);
entity.level.getServer().getPluginManager().callEvent(event);
entity.level.getCraftServer().getPluginManager().callEvent(event);
return event;
}
public static AreaEffectCloudApplyEvent callAreaEffectCloudApplyEvent(EntityAreaEffectCloud cloud, List<LivingEntity> entities) {
AreaEffectCloudApplyEvent event = new AreaEffectCloudApplyEvent((AreaEffectCloud) cloud.getBukkitEntity(), entities);
cloud.level.getServer().getPluginManager().callEvent(event);
cloud.level.getCraftServer().getPluginManager().callEvent(event);
return event;
}
@@ -1447,7 +1447,7 @@ public class CraftEventFactory {
CraftItemStack bredWithStack = bredWith == null ? null : CraftItemStack.asCraftMirror(bredWith).clone();
EntityBreedEvent event = new EntityBreedEvent((LivingEntity) child.getBukkitEntity(), (LivingEntity) mother.getBukkitEntity(), (LivingEntity) father.getBukkitEntity(), breederEntity, bredWithStack, experience);
child.level.getServer().getPluginManager().callEvent(event);
child.level.getCraftServer().getPluginManager().callEvent(event);
return event;
}
@@ -1511,7 +1511,7 @@ public class CraftEventFactory {
blockState.setData(block);
BlockFormEvent event = (entity == null) ? new BlockFormEvent(blockState.getBlock(), blockState) : new EntityBlockFormEvent(entity.getBukkitEntity(), blockState.getBlock(), blockState);
world.getServer().getPluginManager().callEvent(event);
world.getCraftServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {
blockState.update(true);