mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2026-10-26 14:00:14 +00:00
bandaid-fix cartographer crash until Paper adds StructureLocateEvent
This commit is contained in:
1 parent
b2468234fb
commit
85ae0344a1
6 files changed
+41
-27
No files matched your search
@@ -6,10 +6,13 @@ import com.dfsek.terra.util.StructureTypeEnum;
|
|||||||
import org.bukkit.entity.EnderSignal;
|
import org.bukkit.entity.EnderSignal;
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
import org.bukkit.entity.EntityType;
|
import org.bukkit.entity.EntityType;
|
||||||
|
import org.bukkit.entity.Villager;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.entity.EntitySpawnEvent;
|
import org.bukkit.event.entity.EntitySpawnEvent;
|
||||||
|
import org.bukkit.event.entity.VillagerAcquireTradeEvent;
|
||||||
|
import org.bukkit.event.entity.VillagerCareerChangeEvent;
|
||||||
import org.polydev.gaea.GaeaPlugin;
|
import org.polydev.gaea.GaeaPlugin;
|
||||||
|
|
||||||
public class EventListener implements Listener {
|
public class EventListener implements Listener {
|
||||||
@@ -36,4 +39,15 @@ public class EventListener implements Listener {
|
|||||||
} else main.getLogger().warning("No overrides are defined for Strongholds. Ender Signals will not work correctly.");
|
} else main.getLogger().warning("No overrides are defined for Strongholds. Ender Signals will not work correctly.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@EventHandler
|
||||||
|
public void onCartographerChange(VillagerAcquireTradeEvent e) {
|
||||||
|
if(((Villager) e.getEntity()).getProfession().equals(Villager.Profession.CARTOGRAPHER)) e.setCancelled(true); // Cancel leveling if the villager is a Cartographer, to prevent crashing server.
|
||||||
|
}
|
||||||
|
@EventHandler
|
||||||
|
public void onCartographerLevel(VillagerCareerChangeEvent e) {
|
||||||
|
if(e.getProfession().equals(Villager.Profession.CARTOGRAPHER)) {
|
||||||
|
e.getEntity().setProfession(Villager.Profession.NITWIT); // Give villager new profession to prevent server crash.
|
||||||
|
e.setCancelled(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -193,7 +193,7 @@ public class ConfigPack extends YamlConfiguration {
|
|||||||
try {
|
try {
|
||||||
config = new ConfigPack(folder.toFile());
|
config = new ConfigPack(folder.toFile());
|
||||||
if(configs.containsKey(config.getID())) {
|
if(configs.containsKey(config.getID())) {
|
||||||
Bukkit.getLogger().severe("Duplicate Config Pack ID: \"" + config.getID() + "\"");
|
//Bukkit.getLogger().severe("Duplicate Config Pack ID: \"" + config.getID() + "\"");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
configs.put(config.getID(), config);
|
configs.put(config.getID(), config);
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
id: OVERWORLD_DEMO
|
id: DEFAULT
|
||||||
grids:
|
grids:
|
||||||
- OCEAN_DEEP
|
- OCEAN_DEEP
|
||||||
- OCEAN_DEEP
|
- OCEAN_DEEP
|
||||||
@@ -49,8 +49,8 @@ grids:
|
|||||||
- MOUNTAIN
|
- MOUNTAIN
|
||||||
- MOUNTAIN
|
- MOUNTAIN
|
||||||
frequencies:
|
frequencies:
|
||||||
grid-x: 3072
|
grid-x: 5120
|
||||||
grid-z: 2048
|
grid-z: 6144
|
||||||
zone: 4096
|
zone: 4096
|
||||||
blend:
|
blend:
|
||||||
enable: true
|
enable: true
|
||||||
|
|||||||
@@ -1,16 +1,15 @@
|
|||||||
files:
|
files:
|
||||||
stronghold: 1
|
jungle1: 1
|
||||||
id: "STRONGHOLD"
|
id: "JUNGLE"
|
||||||
spawn:
|
spawn:
|
||||||
start:
|
start:
|
||||||
min: 16
|
min: 72
|
||||||
max: 64
|
max: 72
|
||||||
bound:
|
bound:
|
||||||
min: 12
|
min: 48
|
||||||
max: 84
|
max: 96
|
||||||
width: 1000
|
width: 250
|
||||||
padding: 500
|
padding: 50
|
||||||
loot:
|
loot:
|
||||||
1: wood_house
|
0: arrows
|
||||||
2: cobble_house
|
1: cobble_house
|
||||||
3: cobble_house
|
|
||||||
@@ -8,7 +8,7 @@ spawn:
|
|||||||
bound:
|
bound:
|
||||||
min: 48
|
min: 48
|
||||||
max: 96
|
max: 96
|
||||||
width: 100
|
width: 250
|
||||||
padding: 100
|
padding: 500
|
||||||
loot:
|
loot:
|
||||||
1: arrows
|
1: arrows
|
||||||
@@ -1,15 +1,16 @@
|
|||||||
files:
|
files:
|
||||||
jungle1: 1
|
stronghold: 1
|
||||||
id: "JUNGLE"
|
id: "STRONGHOLD"
|
||||||
spawn:
|
spawn:
|
||||||
start:
|
start:
|
||||||
min: 72
|
min: 16
|
||||||
max: 72
|
max: 64
|
||||||
bound:
|
bound:
|
||||||
min: 48
|
min: 12
|
||||||
max: 96
|
max: 84
|
||||||
width: 250
|
width: 1000
|
||||||
padding: 50
|
padding: 500
|
||||||
loot:
|
loot:
|
||||||
0: arrows
|
1: wood_house
|
||||||
1: cobble_house
|
2: cobble_house
|
||||||
|
3: cobble_house
|
||||||
Reference in new issue
Block a user