mirror of
https://github.com/AtlasMediaGroup/TotalFreedomMod.git
synced 2024-11-27 01:05:38 +00:00
resonance freqency of a cow
This commit is contained in:
parent
4a91c8129b
commit
c7e0a7a288
2
.idea/compiler.xml
generated
2
.idea/compiler.xml
generated
@ -8,9 +8,11 @@
|
|||||||
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
|
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
|
||||||
<outputRelativeToContentRoot value="true" />
|
<outputRelativeToContentRoot value="true" />
|
||||||
<module name="TotalFreedomMod" />
|
<module name="TotalFreedomMod" />
|
||||||
|
<module name="totalfreedom" />
|
||||||
</profile>
|
</profile>
|
||||||
</annotationProcessing>
|
</annotationProcessing>
|
||||||
<bytecodeTargetLevel>
|
<bytecodeTargetLevel>
|
||||||
|
<module name="totalfreedom" target="1.8" />
|
||||||
<module name="TotalFreedomMod" target="1.8" />
|
<module name="TotalFreedomMod" target="1.8" />
|
||||||
</bytecodeTargetLevel>
|
</bytecodeTargetLevel>
|
||||||
</component>
|
</component>
|
||||||
|
1
.idea/modules.xml
generated
1
.idea/modules.xml
generated
@ -3,6 +3,7 @@
|
|||||||
<component name="ProjectModuleManager">
|
<component name="ProjectModuleManager">
|
||||||
<modules>
|
<modules>
|
||||||
<module fileurl="file://$PROJECT_DIR$/TotalFreedomMod.iml" filepath="$PROJECT_DIR$/TotalFreedomMod.iml" />
|
<module fileurl="file://$PROJECT_DIR$/TotalFreedomMod.iml" filepath="$PROJECT_DIR$/TotalFreedomMod.iml" />
|
||||||
|
<module fileurl="file://$PROJECT_DIR$/totalfreedom.iml" filepath="$PROJECT_DIR$/totalfreedom.iml" />
|
||||||
</modules>
|
</modules>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
<module type="JAVA_MODULE" version="4">
|
||||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
|
||||||
<output url="file://$MODULE_DIR$/target/classes" />
|
<output url="file://$MODULE_DIR$/target/classes" />
|
||||||
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
<output-test url="file://$MODULE_DIR$/target/test-classes" />
|
||||||
@ -14,7 +14,8 @@
|
|||||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.avaje:ebean:2.8.1" level="project" />
|
<orderEntry type="library" scope="PROVIDED" name="Maven: org.avaje:ebean:2.8.1" level="project" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.14.1-R0.1-SNAPSHOT" level="project" />
|
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.14.1-R0.1-SNAPSHOT" level="project" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.0" level="project" />
|
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.0" level="project" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.13.2-R0.1-SNAPSHOT" level="project" />
|
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.6" level="project" />
|
||||||
|
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.14-R0.1-SNAPSHOT" level="project" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="Maven: com.github.Pravian:Aero:5f82926" level="project" />
|
<orderEntry type="library" scope="PROVIDED" name="Maven: com.github.Pravian:Aero:5f82926" level="project" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.12-R0.1-SNAPSHOT" level="project" />
|
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.12-R0.1-SNAPSHOT" level="project" />
|
||||||
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
|
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
|
||||||
|
40
pom.xml
40
pom.xml
@ -99,10 +99,17 @@
|
|||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>commons-io</groupId>
|
||||||
|
<artifactId>commons-io</artifactId>
|
||||||
|
<version>2.6</version>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.spigotmc</groupId>
|
<groupId>org.spigotmc</groupId>
|
||||||
<artifactId>spigot</artifactId>
|
<artifactId>spigot</artifactId>
|
||||||
<version>1.13.2-R0.1-SNAPSHOT</version>
|
<version>1.14-R0.1-SNAPSHOT</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
@ -127,6 +134,13 @@
|
|||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.github.TFPatches</groupId>
|
||||||
|
<artifactId>TotalFreedomMod</artifactId>
|
||||||
|
<version>4a91c81</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.TFPatches</groupId>
|
<groupId>com.github.TFPatches</groupId>
|
||||||
<artifactId>TF-WorldEdit</artifactId>
|
<artifactId>TF-WorldEdit</artifactId>
|
||||||
@ -263,7 +277,6 @@
|
|||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
|
|
||||||
<!-- Properties -->
|
<!-- Properties -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
@ -329,6 +342,29 @@
|
|||||||
</items>
|
</items>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
|
<!-- Shade -->
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-shade-plugin</artifactId>
|
||||||
|
<version>2.4.3</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>shade</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<minimizeJar>true</minimizeJar>
|
||||||
|
<artifactSet>
|
||||||
|
<includes>
|
||||||
|
<include>commons-io:commons-io</include>
|
||||||
|
</includes>
|
||||||
|
</artifactSet>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
@ -464,7 +464,7 @@ public class FrontDoor extends FreedomService
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
block.setType(Material.SIGN);
|
block.setType(Material.OAK_SIGN);
|
||||||
org.bukkit.block.Sign sign = (org.bukkit.block.Sign)block.getState();
|
org.bukkit.block.Sign sign = (org.bukkit.block.Sign)block.getState();
|
||||||
|
|
||||||
org.bukkit.material.Sign signData = (org.bukkit.material.Sign)sign.getData();
|
org.bukkit.material.Sign signData = (org.bukkit.material.Sign)sign.getData();
|
||||||
|
@ -5,11 +5,11 @@ import ca.momothereal.mojangson.value.MojangsonCompound;
|
|||||||
import ca.momothereal.mojangson.value.MojangsonValue;
|
import ca.momothereal.mojangson.value.MojangsonValue;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import net.minecraft.server.v1_13_R2.NBTTagCompound;
|
import net.minecraft.server.v1_14_R1.NBTTagCompound;
|
||||||
import net.minecraft.server.v1_13_R2.NBTTagList;
|
import net.minecraft.server.v1_14_R1.NBTTagList;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftItemStack;
|
import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
@ -128,7 +128,7 @@ public class MovementValidator extends FreedomService
|
|||||||
|
|
||||||
private Boolean exploitItem(ItemStack item)
|
private Boolean exploitItem(ItemStack item)
|
||||||
{
|
{
|
||||||
net.minecraft.server.v1_13_R2.ItemStack nmsStack = CraftItemStack.asNMSCopy(item);
|
net.minecraft.server.v1_14_R1.ItemStack nmsStack = CraftItemStack.asNMSCopy(item);
|
||||||
NBTTagList modifiers = getAttributeList(nmsStack);
|
NBTTagList modifiers = getAttributeList(nmsStack);
|
||||||
MojangsonCompound compound = new MojangsonCompound();
|
MojangsonCompound compound = new MojangsonCompound();
|
||||||
boolean foundNegative = false;
|
boolean foundNegative = false;
|
||||||
@ -165,7 +165,7 @@ public class MovementValidator extends FreedomService
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private NBTTagList getAttributeList(net.minecraft.server.v1_13_R2.ItemStack stack)
|
private NBTTagList getAttributeList(net.minecraft.server.v1_14_R1.ItemStack stack)
|
||||||
{
|
{
|
||||||
if (stack.getTag() == null)
|
if (stack.getTag() == null)
|
||||||
{
|
{
|
||||||
|
@ -4,16 +4,15 @@ import java.util.Arrays;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import me.totalfreedom.totalfreedommod.util.FLog;
|
import me.totalfreedom.totalfreedommod.util.FLog;
|
||||||
import me.totalfreedom.totalfreedommod.util.FUtil;
|
import me.totalfreedom.totalfreedommod.util.FUtil;
|
||||||
import net.minecraft.server.v1_13_R2.EntityPlayer;
|
import net.minecraft.server.v1_14_R1.EntityPlayer;
|
||||||
import net.minecraft.server.v1_13_R2.MinecraftServer;
|
import net.minecraft.server.v1_14_R1.MinecraftServer;
|
||||||
import net.minecraft.server.v1_13_R2.PropertyManager;
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
|
import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
|
||||||
|
|
||||||
public class ServerInterface extends FreedomService
|
public class ServerInterface extends FreedomService
|
||||||
{
|
{
|
||||||
|
|
||||||
public static final String COMPILE_NMS_VERSION = "v1_13_R2";
|
public static final String COMPILE_NMS_VERSION = "v1_14_R1";
|
||||||
|
|
||||||
public ServerInterface(TotalFreedomMod plugin)
|
public ServerInterface(TotalFreedomMod plugin)
|
||||||
{
|
{
|
||||||
@ -43,9 +42,7 @@ public class ServerInterface extends FreedomService
|
|||||||
|
|
||||||
public void setOnlineMode(boolean mode)
|
public void setOnlineMode(boolean mode)
|
||||||
{
|
{
|
||||||
final PropertyManager manager = getServer().getPropertyManager();
|
getServer().setOnlineMode(mode);
|
||||||
manager.setProperty("online-mode", mode);
|
|
||||||
manager.savePropertiesFile();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public int purgeWhitelist()
|
public int purgeWhitelist()
|
||||||
|
@ -5,7 +5,6 @@ import me.totalfreedom.totalfreedommod.TotalFreedomMod;
|
|||||||
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
|
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
|
||||||
import me.totalfreedom.totalfreedommod.util.FLog;
|
import me.totalfreedom.totalfreedommod.util.FLog;
|
||||||
import me.totalfreedom.totalfreedommod.util.FUtil;
|
import me.totalfreedom.totalfreedommod.util.FUtil;
|
||||||
import me.totalfreedom.totalfreedommod.util.Groups;
|
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
@ -97,6 +96,13 @@ public class BlockBlocker extends FreedomService
|
|||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case JIGSAW:
|
||||||
|
{
|
||||||
|
player.sendMessage(ChatColor.GRAY + "Jigsaws are disabled.");
|
||||||
|
player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
|
||||||
|
event.setCancelled(true);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -55,10 +55,13 @@ public class InteractBlocker extends FreedomService
|
|||||||
{
|
{
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
|
|
||||||
if (event.getClickedBlock() != null && event.getClickedBlock().getType().equals(Material.STRUCTURE_BLOCK))
|
if (event.getClickedBlock() != null)
|
||||||
{
|
{
|
||||||
event.setCancelled(true);
|
if (event.getClickedBlock().getType().equals(Material.STRUCTURE_BLOCK) || event.getClickedBlock().getType().equals(Material.JIGSAW))
|
||||||
event.getPlayer().closeInventory();
|
{
|
||||||
|
event.setCancelled(true);
|
||||||
|
event.getPlayer().closeInventory();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (event.getMaterial())
|
switch (event.getMaterial())
|
||||||
|
@ -59,7 +59,7 @@ public class PotionBlocker extends FreedomService
|
|||||||
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
|
||||||
public void onThrowLingeringPotion(LingeringPotionSplashEvent event)
|
public void onThrowLingeringPotion(LingeringPotionSplashEvent event)
|
||||||
{
|
{
|
||||||
LingeringPotion potion = event.getEntity();
|
ThrownPotion potion = event.getEntity();
|
||||||
ProjectileSource projectileSource = potion.getShooter();
|
ProjectileSource projectileSource = potion.getShooter();
|
||||||
Player player = null;
|
Player player = null;
|
||||||
if (projectileSource instanceof Player)
|
if (projectileSource instanceof Player)
|
||||||
|
@ -2,10 +2,11 @@ package me.totalfreedom.totalfreedommod.blocking;
|
|||||||
|
|
||||||
import me.totalfreedom.totalfreedommod.FreedomService;
|
import me.totalfreedom.totalfreedommod.FreedomService;
|
||||||
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
|
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
|
||||||
import net.minecraft.server.v1_13_R2.NBTTagCompound;
|
import net.minecraft.server.v1_14_R1.NBTTagCompound;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftItemStack;
|
import org.bukkit.Tag;
|
||||||
|
import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
@ -37,11 +38,11 @@ public class SignBlocker extends FreedomService
|
|||||||
{
|
{
|
||||||
|
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
if (event.getBlock().getType().equals(Material.SIGN) || event.getBlock().getType().equals(Material.WALL_SIGN))
|
if (event.getBlock().getType().equals(Tag.SIGNS.getValues()))
|
||||||
{
|
{
|
||||||
|
|
||||||
ItemStack sign = event.getItemInHand();
|
ItemStack sign = event.getItemInHand();
|
||||||
net.minecraft.server.v1_13_R2.ItemStack nmsSign = CraftItemStack.asNMSCopy(sign);
|
net.minecraft.server.v1_14_R1.ItemStack nmsSign = CraftItemStack.asNMSCopy(sign);
|
||||||
NBTTagCompound compound = (nmsSign.hasTag()) ? nmsSign.getTag() : new NBTTagCompound();
|
NBTTagCompound compound = (nmsSign.hasTag()) ? nmsSign.getTag() : new NBTTagCompound();
|
||||||
NBTTagCompound bet = compound.getCompound("BlockEntityTag");
|
NBTTagCompound bet = compound.getCompound("BlockEntityTag");
|
||||||
String line1 = bet.getString("Text1");
|
String line1 = bet.getString("Text1");
|
||||||
@ -64,7 +65,7 @@ public class SignBlocker extends FreedomService
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (event.getClickedBlock() != null && event.getClickedBlock().getType().equals(Material.SIGN) || event.getClickedBlock().getType().equals(Material.WALL_SIGN))
|
if (event.getClickedBlock() != null && Tag.SIGNS.getValues().contains(event.getClickedBlock().getType()))
|
||||||
{
|
{
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
|
@ -4,15 +4,15 @@ import java.util.ArrayList;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import me.totalfreedom.totalfreedommod.rank.Rank;
|
import me.totalfreedom.totalfreedommod.rank.Rank;
|
||||||
import me.totalfreedom.totalfreedommod.util.FUtil;
|
import me.totalfreedom.totalfreedommod.util.FUtil;
|
||||||
import net.minecraft.server.v1_13_R2.NBTTagCompound;
|
import net.minecraft.server.v1_14_R1.NBTTagCompound;
|
||||||
import net.minecraft.server.v1_13_R2.NBTTagInt;
|
import net.minecraft.server.v1_14_R1.NBTTagInt;
|
||||||
import net.minecraft.server.v1_13_R2.NBTTagList;
|
import net.minecraft.server.v1_14_R1.NBTTagList;
|
||||||
import net.minecraft.server.v1_13_R2.NBTTagString;
|
import net.minecraft.server.v1_14_R1.NBTTagString;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.command.Command;
|
import org.bukkit.command.Command;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftItemStack;
|
import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftItemStack;
|
||||||
import org.bukkit.enchantments.Enchantment;
|
import org.bukkit.enchantments.Enchantment;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
@ -149,7 +149,7 @@ public class Command_modifyitem extends FreedomCommand
|
|||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
net.minecraft.server.v1_13_R2.ItemStack nmsStack = CraftItemStack.asNMSCopy(item);
|
net.minecraft.server.v1_14_R1.ItemStack nmsStack = CraftItemStack.asNMSCopy(item);
|
||||||
NBTTagCompound compound = (nmsStack.hasTag()) ? nmsStack.getTag() : new NBTTagCompound();
|
NBTTagCompound compound = (nmsStack.hasTag()) ? nmsStack.getTag() : new NBTTagCompound();
|
||||||
NBTTagList modifiers = getAttributeList(nmsStack);
|
NBTTagList modifiers = getAttributeList(nmsStack);
|
||||||
NBTTagCompound cmpnd = new NBTTagCompound();
|
NBTTagCompound cmpnd = new NBTTagCompound();
|
||||||
@ -188,7 +188,7 @@ public class Command_modifyitem extends FreedomCommand
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private NBTTagList getAttributeList(net.minecraft.server.v1_13_R2.ItemStack stack)
|
private NBTTagList getAttributeList(net.minecraft.server.v1_14_R1.ItemStack stack)
|
||||||
{
|
{
|
||||||
if (stack.getTag() == null)
|
if (stack.getTag() == null)
|
||||||
{
|
{
|
||||||
|
@ -190,9 +190,9 @@ public class Module_schematic extends HTTPDModule
|
|||||||
throw new SchematicTransferException("Can't resolve original file name.");
|
throw new SchematicTransferException("Can't resolve original file name.");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tempFile.length() > FileUtils.ONE_KB * 64L)
|
if (tempFile.length() > FileUtils.ONE_MB )
|
||||||
{
|
{
|
||||||
throw new SchematicTransferException("Schematic is too big (64kb max).");
|
throw new SchematicTransferException("Schematic is too big (1mb max).");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!SCHEMATIC_FILENAME_LC.matcher(origFileName.toLowerCase()).find())
|
if (!SCHEMATIC_FILENAME_LC.matcher(origFileName.toLowerCase()).find())
|
||||||
|
@ -48,6 +48,7 @@ public class Groups
|
|||||||
EntityType.BLAZE,
|
EntityType.BLAZE,
|
||||||
EntityType.CAVE_SPIDER,
|
EntityType.CAVE_SPIDER,
|
||||||
EntityType.CHICKEN,
|
EntityType.CHICKEN,
|
||||||
|
EntityType.CAT,
|
||||||
EntityType.COD,
|
EntityType.COD,
|
||||||
EntityType.COW,
|
EntityType.COW,
|
||||||
EntityType.CREEPER,
|
EntityType.CREEPER,
|
||||||
@ -56,6 +57,7 @@ public class Groups
|
|||||||
EntityType.ENDER_DRAGON,
|
EntityType.ENDER_DRAGON,
|
||||||
EntityType.ENDERMAN,
|
EntityType.ENDERMAN,
|
||||||
EntityType.EVOKER,
|
EntityType.EVOKER,
|
||||||
|
EntityType.FOX,
|
||||||
EntityType.GHAST,
|
EntityType.GHAST,
|
||||||
EntityType.GIANT,
|
EntityType.GIANT,
|
||||||
EntityType.HUSK,
|
EntityType.HUSK,
|
||||||
@ -66,12 +68,15 @@ public class Groups
|
|||||||
EntityType.MAGMA_CUBE,
|
EntityType.MAGMA_CUBE,
|
||||||
EntityType.MUSHROOM_COW,
|
EntityType.MUSHROOM_COW,
|
||||||
EntityType.OCELOT,
|
EntityType.OCELOT,
|
||||||
|
EntityType.PANDA,
|
||||||
EntityType.PARROT,
|
EntityType.PARROT,
|
||||||
|
EntityType.PILLAGER,
|
||||||
EntityType.PHANTOM,
|
EntityType.PHANTOM,
|
||||||
EntityType.PIG,
|
EntityType.PIG,
|
||||||
EntityType.PIG_ZOMBIE,
|
EntityType.PIG_ZOMBIE,
|
||||||
EntityType.POLAR_BEAR,
|
EntityType.POLAR_BEAR,
|
||||||
EntityType.PUFFERFISH,
|
EntityType.PUFFERFISH,
|
||||||
|
EntityType.RAVAGER,
|
||||||
EntityType.SHEEP,
|
EntityType.SHEEP,
|
||||||
EntityType.SHULKER,
|
EntityType.SHULKER,
|
||||||
EntityType.SILVERFISH,
|
EntityType.SILVERFISH,
|
||||||
@ -82,6 +87,7 @@ public class Groups
|
|||||||
EntityType.SQUID,
|
EntityType.SQUID,
|
||||||
EntityType.STRAY,
|
EntityType.STRAY,
|
||||||
EntityType.TROPICAL_FISH,
|
EntityType.TROPICAL_FISH,
|
||||||
|
EntityType.TRADER_LLAMA,
|
||||||
EntityType.TURTLE,
|
EntityType.TURTLE,
|
||||||
EntityType.VEX,
|
EntityType.VEX,
|
||||||
EntityType.VILLAGER,
|
EntityType.VILLAGER,
|
||||||
@ -89,6 +95,7 @@ public class Groups
|
|||||||
EntityType.WITHER,
|
EntityType.WITHER,
|
||||||
EntityType.WITHER_SKELETON,
|
EntityType.WITHER_SKELETON,
|
||||||
EntityType.VINDICATOR,
|
EntityType.VINDICATOR,
|
||||||
|
EntityType.WANDERING_TRADER,
|
||||||
EntityType.WOLF,
|
EntityType.WOLF,
|
||||||
EntityType.ZOMBIE);
|
EntityType.ZOMBIE);
|
||||||
}
|
}
|
||||||
|
@ -67,7 +67,7 @@ public final class AdminWorld extends CustomWorld
|
|||||||
world.setSpawnLocation(0, 50, 0);
|
world.setSpawnLocation(0, 50, 0);
|
||||||
|
|
||||||
final Block welcomeSignBlock = world.getBlockAt(0, 50, 0);
|
final Block welcomeSignBlock = world.getBlockAt(0, 50, 0);
|
||||||
welcomeSignBlock.setType(Material.SIGN);
|
welcomeSignBlock.setType(Material.OAK_SIGN);
|
||||||
org.bukkit.block.Sign welcomeSign = (org.bukkit.block.Sign)welcomeSignBlock.getState();
|
org.bukkit.block.Sign welcomeSign = (org.bukkit.block.Sign)welcomeSignBlock.getState();
|
||||||
|
|
||||||
org.bukkit.material.Sign signData = (org.bukkit.material.Sign)welcomeSign.getData();
|
org.bukkit.material.Sign signData = (org.bukkit.material.Sign)welcomeSign.getData();
|
||||||
|
@ -45,7 +45,7 @@ public class Flatlands extends CustomWorld
|
|||||||
world.setSpawnLocation(0, 50, 0);
|
world.setSpawnLocation(0, 50, 0);
|
||||||
|
|
||||||
final Block welcomeSignBlock = world.getBlockAt(0, 50, 0);
|
final Block welcomeSignBlock = world.getBlockAt(0, 50, 0);
|
||||||
welcomeSignBlock.setType(Material.SIGN);
|
welcomeSignBlock.setType(Material.OAK_SIGN);
|
||||||
org.bukkit.block.Sign welcomeSign = (org.bukkit.block.Sign)welcomeSignBlock.getState();
|
org.bukkit.block.Sign welcomeSign = (org.bukkit.block.Sign)welcomeSignBlock.getState();
|
||||||
|
|
||||||
org.bukkit.material.Sign signData = (org.bukkit.material.Sign)welcomeSign.getData();
|
org.bukkit.material.Sign signData = (org.bukkit.material.Sign)welcomeSign.getData();
|
||||||
|
@ -44,7 +44,7 @@ public final class MasterBuilderWorld extends CustomWorld
|
|||||||
world.setSpawnLocation(0, 50, 0);
|
world.setSpawnLocation(0, 50, 0);
|
||||||
|
|
||||||
final Block welcomeSignBlock = world.getBlockAt(0, 50, 0);
|
final Block welcomeSignBlock = world.getBlockAt(0, 50, 0);
|
||||||
welcomeSignBlock.setType(Material.SIGN);
|
welcomeSignBlock.setType(Material.OAK_SIGN);
|
||||||
org.bukkit.block.Sign welcomeSign = (org.bukkit.block.Sign)welcomeSignBlock.getState();
|
org.bukkit.block.Sign welcomeSign = (org.bukkit.block.Sign)welcomeSignBlock.getState();
|
||||||
|
|
||||||
org.bukkit.material.Sign signData = (org.bukkit.material.Sign)welcomeSign.getData();
|
org.bukkit.material.Sign signData = (org.bukkit.material.Sign)welcomeSign.getData();
|
||||||
|
@ -208,6 +208,8 @@ blocked_commands:
|
|||||||
- 's:b:/fill:_'
|
- 's:b:/fill:_'
|
||||||
- 's:b:/flood:_'
|
- 's:b:/flood:_'
|
||||||
- 's:b:/team:_'
|
- 's:b:/team:_'
|
||||||
|
- 's:b:/loot:_'
|
||||||
|
- 's:b:/schedule:_'
|
||||||
|
|
||||||
# Automatically wipe dropped objects
|
# Automatically wipe dropped objects
|
||||||
auto_wipe: true
|
auto_wipe: true
|
||||||
|
Loading…
Reference in New Issue
Block a user