SteamWar/Paper
10
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

8
paper-server/nms-patches/net/minecraft/server/level/WorldServer.patch
View File

@@ -107,7 +107,7 @@
}
this.sleepStatus = new SleepStatus();
+ this.getServer().addWorld(this.getWorld()); // CraftBukkit
+ this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
+ }
+
+ // CraftBukkit start
@@ -130,7 +130,7 @@
+ }
+
+ private TileEntity fixTileEntity(BlockPosition pos, IBlockData type, TileEntity found) {
+ this.getServer().getLogger().log(Level.SEVERE, "Block at {0}, {1}, {2} is {3} but has {4}" + ". "
+ this.getCraftServer().getLogger().log(Level.SEVERE, "Block at {0}, {1}, {2} is {3} but has {4}" + ". "
+ + "Bukkit will attempt to fix this, but there may be additional damage that we cannot recover.", new Object[]{pos.getX(), pos.getY(), pos.getZ(), type, found});
+
+ if (type instanceof ITileEntity) {
@@ -188,7 +188,7 @@
+ TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (l - l % 24000L) - this.getDayTime());
if (this.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
- long l = this.levelData.getDayTime() + 24000L;
+ getServer().getPluginManager().callEvent(event);
+ getCraftServer().getPluginManager().callEvent(event);
+ if (!event.isCancelled()) {
+ this.setDayTime(this.getDayTime() + event.getSkipAmount());
+ }
@@ -632,7 +632,7 @@
+ org.bukkit.World bworld = worldserver.getWorld();
+ org.bukkit.event.world.PortalCreateEvent portalEvent = new org.bukkit.event.world.PortalCreateEvent((List<org.bukkit.block.BlockState>) (List) blockList.getList(), bworld, (entity == null) ? null : entity.getBukkitEntity(), org.bukkit.event.world.PortalCreateEvent.CreateReason.END_PLATFORM);
+
+ worldserver.getServer().getPluginManager().callEvent(portalEvent);
+ worldserver.getCraftServer().getPluginManager().callEvent(portalEvent);
+ if (!portalEvent.isCancelled()) {
+ blockList.updateList();
+ }