Target 1.13

This commit is contained in:
mathias 2018-08-02 14:32:11 +03:00
parent 38f6a4565a
commit b93c9d08e7
4 changed files with 9 additions and 66 deletions

22
pom.xml
View file

@ -2,25 +2,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>pw.kaboom</groupId>
<artifactId>Extras</artifactId>
<version>1.0.0</version>
<properties>
<maven.compiler.source>7</maven.compiler.source>
<maven.compiler.target>7</maven.compiler.target>
</properties>
<version>master</version>
<dependencies>
<dependency>
<groupId>com.destroystokyo.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.12.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.12.2-R0.1-SNAPSHOT</version>
<type>jar</type>
<version>1.13-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@ -58,12 +46,6 @@
<build>
<finalName>${project.artifactId}</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
</project>

View file

@ -5,15 +5,6 @@ import java.lang.reflect.Modifier;
import com.destroystokyo.paper.profile.PlayerProfile;
import com.mojang.authlib.GameProfile;
import net.minecraft.server.v1_12_R1.PacketPlayInClientCommand;
import net.minecraft.server.v1_12_R1.PacketPlayInClientCommand.EnumClientCommand;
import net.minecraft.server.v1_12_R1.PacketPlayOutEntityDestroy;
import net.minecraft.server.v1_12_R1.PacketPlayOutNamedEntitySpawn;
import net.minecraft.server.v1_12_R1.PacketPlayOutPlayerInfo;
import net.minecraft.server.v1_12_R1.PacketPlayOutPlayerInfo.EnumPlayerInfoAction;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Chunk;
@ -27,8 +18,6 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Entity;
@ -65,7 +54,7 @@ class CommandDestroyEntities implements CommandExecutor {
for (World world : Bukkit.getServer().getWorlds()) {
for (Chunk chunk : world.getLoadedChunks()) {
for (Entity entity : chunk.getEntities()) {
if (!entity.getType().equals(EntityType.PLAYER)) {
if (entity.getType() != EntityType.PLAYER) {
entity.remove();
}
}
@ -141,7 +130,7 @@ class CommandJumpscare implements CommandExecutor {
private void createJumpscare(Player player) {
player.spawnParticle(Particle.MOB_APPEARANCE, player.getLocation(), 4);
for (int i = 0; i < 10; ++i) {
player.playSound(player.getLocation(), Sound.ENTITY_ENDERMEN_SCREAM, 1, 0);
player.playSound(player.getLocation(), Sound.ENTITY_ENDERMAN_SCREAM, 1, 0);
}
}
@ -150,7 +139,7 @@ class CommandJumpscare implements CommandExecutor {
if (args.length == 0) {
player.sendMessage(ChatColor.RED + "Usage: /" + label + " <player>");
} else {
if (args[0].equalsIgnoreCase("*") || args[0].equalsIgnoreCase("**")) {
if (args[0].equals("*") || args[0].equals("**")) {
for (Player p: Bukkit.getOnlinePlayers()) {
createJumpscare(p);
}
@ -246,27 +235,6 @@ class CommandUnloadChunks implements CommandExecutor {
}
class CommandUsername implements CommandExecutor {
private void changeName(Player player, String name){
for (Player otherPlayer: Bukkit.getOnlinePlayers()){
((CraftPlayer)otherPlayer).getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.REMOVE_PLAYER, ((CraftPlayer)player).getHandle()));
try {
Field nameField = GameProfile.class.getDeclaredField("name");
nameField.setAccessible(true);
nameField.set(((CraftPlayer)player).getProfile(), name);
} catch (IllegalAccessException | NoSuchFieldException exception) {
exception.printStackTrace();
}
((CraftPlayer)otherPlayer).getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.ADD_PLAYER, ((CraftPlayer)player).getHandle()));
if (otherPlayer.getUniqueId() != player.getUniqueId()) {
((CraftPlayer)otherPlayer).getHandle().playerConnection.sendPacket(new PacketPlayOutEntityDestroy(player.getEntityId()));
((CraftPlayer)otherPlayer).getHandle().playerConnection.sendPacket(new PacketPlayOutNamedEntitySpawn(((CraftPlayer)player).getHandle()));
}
}
}
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
Player player = (Player)sender;
if (args.length == 0) {
@ -280,12 +248,6 @@ class CommandUsername implements CommandExecutor {
profile.complete();
profile.clearProperties();
player.setPlayerProfile(profile);
/*Location location = player.getLocation();
/*changeName(player, name);
/*player.setHealth(0);
player.spigot().respawn();
player.teleport(location);
/*((CraftPlayer)player).getHandle().playerConnection.sendPacket(new PacketPlayInClientCommand(EnumClientCommand.PERFORM_RESPAWN));*/
player.sendMessage("Successfully set your username to \"" + name + "\"");
}
return true;

View file

@ -245,10 +245,8 @@ class Events implements Listener {
}
}
if (block.getType() == Material.LAVA ||
block.getType() == Material.SOIL ||
block.getType() == Material.STATIONARY_LAVA ||
block.getType() == Material.STATIONARY_WATER ||
if (block.getType() == Material.FARMLAND ||
block.getType() == Material.LAVA ||
block.getType() == Material.WATER) {
event.setCancelled(true);
}

View file

@ -2,7 +2,8 @@ name: Extras
main: pw.kaboom.extras.Main
description: Plugin that adds extra functionality to the Kaboom.pw server.
depend: [WorldEdit]
version: ${project.version}
api-version: 1.13
version: master
commands:
clearchat: